From 9c9e52d55040d137454332901ce1a4d25f5ad3b4 Mon Sep 17 00:00:00 2001 From: Jason Little Date: Wed, 14 Jan 2026 08:02:35 -0600 Subject: [PATCH 1/3] bump: github actions/setup-python to v6.1.0 to match upstream https://github.com/actions/setup-python/compare/v5.6.0...v6.1.0 --- .github/workflows/docker-famedly.yml | 2 +- .github/workflows/famedly-tests.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-famedly.yml b/.github/workflows/docker-famedly.yml index 4ef4dd70a0..0a4856a686 100644 --- a/.github/workflows/docker-famedly.yml +++ b/.github/workflows/docker-famedly.yml @@ -58,7 +58,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 with: python-version: "3.x" - id: get-matrix diff --git a/.github/workflows/famedly-tests.yml b/.github/workflows/famedly-tests.yml index 671b9c09af..df2085425c 100644 --- a/.github/workflows/famedly-tests.yml +++ b/.github/workflows/famedly-tests.yml @@ -37,7 +37,7 @@ jobs: # steps: # - uses: actions/checkout@v4 - # - uses: actions/setup-python@v5 + # - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 # with: # python-version: "3.x" # - run: "pip install 'click==8.1.1' 'GitPython>=3.1.20'" @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 with: python-version: "3.13" - run: .ci/scripts/check_lockfile.py @@ -147,7 +147,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 with: python-version: "3.13" - run: "pip install rstcheck" @@ -177,7 +177,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 with: python-version: "3.x" - id: get-matrix @@ -382,7 +382,7 @@ jobs: path: synapse-invite-checker - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 with: python-version: "3.13" @@ -451,7 +451,7 @@ jobs: path: synapse-token-authenticator - name: Setup Python - uses: actions/setup-python@v5 + uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0 with: python-version: "3.13" From ca0ace72a9c1b77d2e9028ee9bf0e53e83ffb29f Mon Sep 17 00:00:00 2001 From: Jason Little Date: Wed, 14 Jan 2026 08:17:46 -0600 Subject: [PATCH 2/3] bump: github action Swatinem/rust-cache to v2.8.0 in Famedly workflows As this is the newest in the allowed workflows organization restriction https://github.com/Swatinem/rust-cache/compare/v2.7.6...v2.8.2 --- .github/workflows/docs.yaml | 2 +- .github/workflows/famedly-tests.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index e8cfd02e47..6a4fea00ae 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -60,7 +60,7 @@ jobs: fetch-depth: 0 - name: Caching - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 + uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 with: shared-key: "mdbook" save-if: ${{ ! startsWith(github.ref, 'gh-readonly-queue/') }} diff --git a/.github/workflows/famedly-tests.yml b/.github/workflows/famedly-tests.yml index df2085425c..7425d010ac 100644 --- a/.github/workflows/famedly-tests.yml +++ b/.github/workflows/famedly-tests.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: Swatinem/rust-cache@68b3cb7503c78e67dae8373749990a220eb65352 + - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 - uses: matrix-org/setup-python-poetry@v2 with: python-version: "3.13" @@ -80,7 +80,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - uses: Swatinem/rust-cache@68b3cb7503c78e67dae8373749990a220eb65352 + - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 - name: Setup Poetry uses: matrix-org/setup-python-poetry@v2 @@ -121,7 +121,7 @@ jobs: # steps: # - uses: actions/checkout@v4 - # - uses: Swatinem/rust-cache@68b3cb7503c78e67dae8373749990a220eb65352 + # - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 # - run: cargo clippy -- -D warnings @@ -137,7 +137,7 @@ jobs: # # We use nightly so that it correctly groups together imports # toolchain: nightly-2022-12-01 # components: rustfmt - # - uses: Swatinem/rust-cache@v2 + # - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 # - run: cargo fmt --check @@ -218,7 +218,7 @@ jobs: -e POSTGRES_INITDB_ARGS="--lc-collate C --lc-ctype C --encoding UTF8" \ postgres:${{ matrix.job.postgres-version }} - - uses: Swatinem/rust-cache@68b3cb7503c78e67dae8373749990a220eb65352 + - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 - uses: matrix-org/setup-python-poetry@v2 with: @@ -291,7 +291,7 @@ jobs: - name: Prepare test blacklist run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers - - uses: Swatinem/rust-cache@68b3cb7503c78e67dae8373749990a220eb65352 + - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 - name: Run SyTest run: /bootstrap.sh synapse @@ -333,7 +333,7 @@ jobs: with: path: synapse - - uses: Swatinem/rust-cache@68b3cb7503c78e67dae8373749990a220eb65352 + - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 - name: Prepare Complement's Prerequisites run: synapse/.ci/scripts/setup_complement_prerequisites.sh @@ -361,7 +361,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: Swatinem/rust-cache@68b3cb7503c78e67dae8373749990a220eb65352 + - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 - run: cargo test From 0bb4383ec468a8e7199864f40eb503baa5dde450 Mon Sep 17 00:00:00 2001 From: Jason Little Date: Wed, 14 Jan 2026 09:36:12 -0600 Subject: [PATCH 3/3] chore: remove a usage of the rust-cache action that did nothing This action is not necessary or used here. Synapse is installed into a docker image, and that means the rust building is not accessible from the Github runner environment. This is the output from the action: Error: The process '/home/runner/.cargo/bin/cargo' failed with exit code 101 at ExecState._setResult (/home/runner/work/_actions/Swatinem/rust-cache/98c8021b550208e191a6a3145459bfc9fb29c4c0/dist/restore/index.js:9728:25) at ExecState.CheckComplete (/home/runner/work/_actions/Swatinem/rust-cache/98c8021b550208e191a6a3145459bfc9fb29c4c0/dist/restore/index.js:9711:18) at ChildProcess. (/home/runner/work/_actions/Swatinem/rust-cache/98c8021b550208e191a6a3145459bfc9fb29c4c0/dist/restore/index.js:9605:27) at ChildProcess.emit (node:events:524:28) at maybeClose (node:internal/child_process:1104:16) at ChildProcess._handle.onexit (node:internal/child_process:304:5) { commandFailed: { command: 'cargo metadata --all-features --format-version 1 --no-deps', stderr: 'error: could not find `Cargo.toml` in `/home/runner/work/synapse/synapse` or any parent directory\n' } } --- .github/workflows/famedly-tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/famedly-tests.yml b/.github/workflows/famedly-tests.yml index 7425d010ac..03f8695c0c 100644 --- a/.github/workflows/famedly-tests.yml +++ b/.github/workflows/famedly-tests.yml @@ -333,8 +333,6 @@ jobs: with: path: synapse - - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0 - - name: Prepare Complement's Prerequisites run: synapse/.ci/scripts/setup_complement_prerequisites.sh