Merge pull request #55 from xmtp/tyler/merge-upstream-main

Merge upstream openmls/openmls main (65396d8) into main

Author: tylerhawkes

.github/workflows/benches.yml

@@ -8,24 +8,27 @@ on:
   push:
     branches:
       - main
+    paths-ignore:
+      - '**/*.md'
+      - 'book/**'
+      - 'LICENSE*'
+      - '.gitignore'
   pull_request:
+    paths-ignore:
+      - '**/*.md'
+      - 'book/**'
+      - 'LICENSE*'
+      - '.gitignore'
   workflow_dispatch:
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   benchmarks:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - macos-latest
-          - ubuntu-latest
-          - windows-latest
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - uses: dtolnay/rust-toolchain@stable

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: Build
 
-concurrency: 
+concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
@@ -39,34 +39,20 @@ jobs:
           - aarch64-apple-ios
           # WASM
           - wasm32-unknown-unknown
-        include:
-          # Compile iOS sim on macOS
-          - os: macos-latest
-            arch: aarch64-apple-ios-sim
-        mode:
-          - debug
-          - release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      # Install the required target
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: ${{ matrix.arch }}
       - uses: Swatinem/rust-cache@v2
 
-      - run: |
-          if [ ${{ matrix.mode }} == debug ]; then
-            echo "TEST_MODE=" >> $GITHUB_ENV
-          else
-            echo "TEST_MODE=--release" >> $GITHUB_ENV
-          fi
       - name: Build (wasm)
         if: matrix.arch == 'wasm32-unknown-unknown'
-        run: cargo build $TEST_MODE --verbose --target ${{ matrix.arch }} -p openmls -F js
+        run: cargo build --release --verbose --target ${{ matrix.arch }} -p openmls -F js
       - name: Build
-        if: ${{ matrix.arch != 'wasm32-unknown-unknown'  }} 
-        run: cargo build $TEST_MODE --verbose --target ${{ matrix.arch }} -p openmls
+        if: ${{ matrix.arch != 'wasm32-unknown-unknown'  }}
+        run: cargo build --release --verbose --target ${{ matrix.arch }} -p openmls
 
   # Check feature powerset
   check:
@@ -75,14 +61,33 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - uses: taiki-e/install-action@cargo-hack
 
-      # Group all features except fork-resolution,js,extensions-draft-08
+      # Group features into independent axes to keep the powerset small.
+      # `virtual-clients-draft` already enables `extensions-draft-08`, so they
+      # share one "drafts" group. The pure cfg-gate flags don't interact and
+      # form a "misc" group. `all-ciphersuites` only affects test expansion and
+      # has no effect on a `--no-dev-deps check`, so it is excluded.
       - name: Cargo hack
         run: |
           cargo hack check --feature-powerset --no-dev-deps --verbose -p openmls \
           --group-features test-utils,crypto-debug,content-debug,backtrace,libcrux-provider,sqlite-provider \
-          --group-features extensions-draft-08,extensions-draft-08-test-dependencies
+          --group-features extensions-draft,extensions-draft-test-dependencies,virtual-clients-draft,virtual-clients-draft-test-dependencies \
+          --group-features js,js-test \
+          --group-features 0-8-1-storage-format,generate-kats,unchecked-conversions,fork-resolution \
+          --exclude-features all-ciphersuites
+
+  # Verify the crates build with the declared MSRV (specified in rust-version in Cargo.toml)
+  msrv:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install dependencies
+        run: sudo apt-get -y install protobuf-compiler # Needed to build the interop client
+      - uses: actions/checkout@v7
+      # keep in sync with rust-version in Cargo.toml
+      - uses: dtolnay/rust-toolchain@1.91.0
+      - uses: Swatinem/rust-cache@v2
+      - run: cargo check --locked --workspace --all-features --all-targets

.github/workflows/build_test_sqlx_provider.yml

@@ -24,7 +24,7 @@ jobs:
           - macos-latest
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
@@ -36,9 +36,9 @@ jobs:
       - name: Test openmls_sqlx_storage
         run: |
           cargo test --manifest-path sqlx_storage/Cargo.toml
-      - name: Build openmls_sqlx_storage with `extensions-draft-08` feature
+      - name: Build openmls_sqlx_storage with `extensions-draft` feature
         run: |
-          cargo build -F extensions-draft-08 --manifest-path sqlx_storage/Cargo.toml
-      - name: Test openmls_sqlx_storage with `extensions-draft-08` feature
+          cargo build -F extensions-draft --manifest-path sqlx_storage/Cargo.toml
+      - name: Test openmls_sqlx_storage with `extensions-draft` feature
         run: |
-          cargo test -F extensions-draft-08 --manifest-path sqlx_storage/Cargo.toml
+          cargo test -F extensions-draft --manifest-path sqlx_storage/Cargo.toml

.github/workflows/build_test_workspace.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Install dependencies
         if: matrix.os == 'macos-latest'
         run: brew install protobuf
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
@@ -42,9 +42,9 @@ jobs:
       - name: Test workspace
         run: |
           cargo test --workspace --all-targets --exclude=openmls --exclude openmls-fuzz
-      - name: Build workspace with `extensions-draft-08` feature
+      - name: Build workspace with experimental features
         run: |
-          cargo build --workspace -F extensions-draft-08 --all-targets --exclude openmls-fuzz
-      - name: Test workspace with `extensions-draft-08` feature
+          cargo build --workspace -F extensions-draft,draft-ietf-mls-pq-ciphersuites --all-targets --exclude openmls-fuzz
+      - name: Test workspace with experimental features
         run: |
-          cargo test --workspace -F extensions-draft-08 --all-targets --exclude=openmls --exclude openmls-fuzz
+          cargo test --workspace -F extensions-draft,draft-ietf-mls-pq-ciphersuites --all-targets --exclude=openmls --exclude openmls-fuzz

.github/workflows/checks.yml

@@ -17,7 +17,7 @@ jobs:
   checks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - uses: dtolnay/rust-toolchain@stable

.github/workflows/clippy.yml

@@ -11,7 +11,7 @@ jobs:
   clippy_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy

.github/workflows/coverage.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           submodules: true
 
@@ -36,7 +36,7 @@ jobs:
         run: grcov . -s . --binary-path ./target/debug/ -t lcov --branch --ignore-not-existing -o ./target/debug/coverage/
 
       - name: Upload to codecov.io
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: target/debug/coverage/lcov 

.github/workflows/docs.yml

@@ -14,7 +14,8 @@ jobs:
   checks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: actions/checkout@v7
+      - uses: dtolnay/rust-toolchain@nightly
       - uses: Swatinem/rust-cache@v2
-      - run: cargo doc -p openmls --message-format json
+      - run: RUSTDOCFLAGS="--cfg doc_cfg --cfg docsrs" cargo +nightly doc --all-features --no-deps
+        working-directory: openmls

.github/workflows/fuzz.yml

@@ -4,7 +4,17 @@ on:
   push:
     branches:
       - main
+    paths-ignore:
+      - '**/*.md'
+      - 'book/**'
+      - 'LICENSE*'
+      - '.gitignore'
   pull_request:
+    paths-ignore:
+      - '**/*.md'
+      - 'book/**'
+      - 'LICENSE*'
+      - '.gitignore'
   workflow_dispatch:
 
 concurrency: 
@@ -19,7 +29,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, ubuntu-latest]
         tests: [welcome_decode, mls_message_decode, proposal_decode]
         include:
           - tests: welcome_decode
@@ -28,9 +37,9 @@ jobs:
             runs: 50000
           - tests: proposal_decode
             runs: 50000
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: nightly

.github/workflows/gh-pages.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: hecrj/setup-rust-action@master
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: nightly