Merge remote-tracking branch 'upstream/main' into update-latest-backward-incompat

Author: tylerhawkes

.github/dependabot.yml

@@ -10,8 +10,16 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    groups:
+      cargo-dependencies:
+        patterns:
+          - "*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    groups:
+      github-actions-dependencies:
+        patterns:
+          - "*"

.github/workflows/build.yml

@@ -84,4 +84,5 @@ jobs:
       - 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 test-utils,crypto-debug,content-debug,backtrace,libcrux-provider,sqlite-provider \
+          --group-features extensions-draft-08,extensions-draft-08-test-dependencies

.github/workflows/build_test_sqlx_provider.yml

@@ -0,0 +1,44 @@
+name: Build & test sqlx storage provider crate
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v6
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            sqlx_storage -> target
+      - name: Build openmls_sqlx_storage
+        run: |
+          cargo build --manifest-path sqlx_storage/Cargo.toml
+      - name: Test openmls_sqlx_storage
+        run: |
+          cargo test --manifest-path sqlx_storage/Cargo.toml
+      - name: Build openmls_sqlx_storage with `extensions-draft-08` feature
+        run: |
+          cargo build -F extensions-draft-08 --manifest-path sqlx_storage/Cargo.toml
+      - name: Test openmls_sqlx_storage with `extensions-draft-08` feature
+        run: |
+          cargo test -F extensions-draft-08 --manifest-path sqlx_storage/Cargo.toml

.github/workflows/build_test_workspace.yml

@@ -33,11 +33,18 @@ jobs:
       - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            . -> target
       - name: Build workspace
-        run: cargo build --workspace --all-targets --exclude openmls-fuzz
+        run: |
+          cargo build --workspace --all-targets --exclude openmls-fuzz
       - name: Test workspace
-        run: cargo test --workspace --all-targets --exclude=openmls --exclude openmls-fuzz
+        run: |
+          cargo test --workspace --all-targets --exclude=openmls --exclude openmls-fuzz
       - name: Build workspace with `extensions-draft-08` feature
-        run: cargo build --workspace -F extensions-draft-08 --all-targets --exclude openmls-fuzz
+        run: |
+          cargo build --workspace -F extensions-draft-08 --all-targets --exclude openmls-fuzz
       - name: Test workspace with `extensions-draft-08` feature
-        run: cargo test --workspace -F extensions-draft-08 --all-targets --exclude=openmls --exclude openmls-fuzz
+        run: |
+          cargo test --workspace -F extensions-draft-08 --all-targets --exclude=openmls --exclude openmls-fuzz

.github/workflows/coverage.yml

@@ -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@v5
+        uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: target/debug/coverage/lcov 

.github/workflows/tests.yml

@@ -32,7 +32,7 @@ jobs:
         features:
           - { name: "", arg: "" }
           - { name: fork-resolution, arg: "-F fork-resolution" }
-          - { name: extensions-draft-08, arg: "-F extensions-draft-08" }
+          - { name: extensions-draft-08, arg: "-F extensions-draft-08,extensions-draft-08-test-dependencies" }
     runs-on: ${{ matrix.target.os }}
     name: ${{ matrix.target.target }} (${{ matrix.mode.name }}/${{ matrix.features.name }})
     steps:

.gitignore

@@ -3,7 +3,6 @@ delivery-service/ds/target
 **/*.rs.bk
 .DS_Store
 .vscode
-**/Cargo.lock
 *.code-workspace
 /test_vectors/
 fuzz/corpus

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - [#1972](https://github.com/openmls/openmls/pull/1972): Add APIs for time-based deletion of past epoch secrets, and for setting the past epoch deletion policy for an `MlsGroup`.
+- [#2010](https://github.com/openmls/openmls/pull/2010): Added `MlsGroup::propose_self_update_with_new_signer`, a variant of `propose_self_update` that stages an `Update` proposal carrying a new signature key.
 
 ### Changed