From 7ae71d04a6f639685bd14036fa06b6a1666f84ef Mon Sep 17 00:00:00 2001 From: "Michael H." Date: Fri, 26 Jun 2026 17:31:45 +0200 Subject: [PATCH 1/3] test: remove sccache --- .github/workflows/daedalus-docker.yml | 22 ---------------------- .github/workflows/labrinth-docker.yml | 21 --------------------- .github/workflows/theseus-build.yml | 13 ------------- .github/workflows/turbo-ci.yml | 24 ------------------------ 4 files changed, 80 deletions(-) diff --git a/.github/workflows/daedalus-docker.yml b/.github/workflows/daedalus-docker.yml index c401860968..b196184160 100644 --- a/.github/workflows/daedalus-docker.yml +++ b/.github/workflows/daedalus-docker.yml @@ -73,17 +73,6 @@ jobs: docker: runs-on: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'blacksmith-4vcpu-ubuntu-2404' || 'ubuntu-latest' }} - env: - SCCACHE_DIR: ${{ needs.skip-if-clean.outputs.internal == 'true' && '/mnt/sccache' || '' }} - SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '10G' || '' }} - SCCACHE_MULTILEVEL_CHAIN: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'disk,s3' || '' }} - SCCACHE_S3_KEY_PREFIX: ${{ needs.skip-if-clean.outputs.internal == 'true' && format('{0}/', github.repository) || '' }} - SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }} - SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }} - SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }} - AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }} - RUSTC_WRAPPER: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'sccache' || '' }} needs: [skip-if-clean] if: ${{ needs.skip-if-clean.outputs.skip != 'true' }} steps: @@ -108,17 +97,6 @@ jobs: ~/.cargo/bin key: ${{ runner.os }}-${{ runner.arch }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - name: Mount sccache disk cache - if: needs.skip-if-clean.outputs.internal == 'true' - uses: useblacksmith/stickydisk@13af8883542ca949a717e70fef89d15edbb29d88 # v1.2.0 - with: - key: ${{ github.repository }}-daedalus-sccache - path: /mnt/sccache - - - name: Setup sccache - if: needs.skip-if-clean.outputs.internal == 'true' - uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10 - - name: Build daedalus_client run: cargo build --release --package daedalus_client diff --git a/.github/workflows/labrinth-docker.yml b/.github/workflows/labrinth-docker.yml index ca249994b9..5d31203e6b 100644 --- a/.github/workflows/labrinth-docker.yml +++ b/.github/workflows/labrinth-docker.yml @@ -76,16 +76,6 @@ jobs: env: SQLX_OFFLINE: 'true' GIT_HASH: ${{ github.sha }} - SCCACHE_DIR: ${{ needs.skip-if-clean.outputs.internal == 'true' && '/mnt/sccache' || '' }} - SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '10G' || '' }} - SCCACHE_MULTILEVEL_CHAIN: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'disk,s3' || '' }} - SCCACHE_S3_KEY_PREFIX: ${{ needs.skip-if-clean.outputs.internal == 'true' && format('{0}/', github.repository) || '' }} - SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }} - SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }} - SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }} - AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }} - RUSTC_WRAPPER: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'sccache' || '' }} steps: - name: Check out code uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 @@ -114,17 +104,6 @@ jobs: ~/.cargo/bin key: ${{ runner.os }}-${{ runner.arch }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - name: Mount sccache disk cache - if: needs.skip-if-clean.outputs.internal == 'true' - uses: useblacksmith/stickydisk@13af8883542ca949a717e70fef89d15edbb29d88 # v1.2.0 - with: - key: ${{ github.repository }}-labrinth-sccache - path: /mnt/sccache - - - name: Setup sccache - if: needs.skip-if-clean.outputs.internal == 'true' - uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10 - - name: Build labrinth run: cargo build --profile release-labrinth --package labrinth diff --git a/.github/workflows/theseus-build.yml b/.github/workflows/theseus-build.yml index 4c7ad48e46..011176f68c 100644 --- a/.github/workflows/theseus-build.yml +++ b/.github/workflows/theseus-build.yml @@ -44,16 +44,6 @@ jobs: name: Build env: VITE_STRIPE_PUBLISHABLE_KEY: pk_live_51JbFxJJygY5LJFfKLVVldb10HlLt24p421OWRsTOWc5sXYFOnFUXWieSc6HD3PHo25ktx8db1WcHr36XGFvZFVUz00V9ixrCs5 - # SCCACHE_DIR: '/mnt/sccache' - # SCCACHE_CACHE_SIZE: '10G' - # SCCACHE_MULTILEVEL_CHAIN: 'disk,s3' - SCCACHE_S3_KEY_PREFIX: '${{ github.repository }}/' - SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }} - SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }} - SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }} - AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }} - RUSTC_WRAPPER: 'sccache' strategy: fail-fast: false matrix: @@ -88,9 +78,6 @@ jobs: if: contains(matrix.platform, 'ubuntu') uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 / Mold 2.41.0 - - name: Setup sccache - uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10 - - name: Enable Corepack run: corepack enable diff --git a/.github/workflows/turbo-ci.yml b/.github/workflows/turbo-ci.yml index c0cd950d99..dfa18abbbf 100644 --- a/.github/workflows/turbo-ci.yml +++ b/.github/workflows/turbo-ci.yml @@ -76,19 +76,6 @@ jobs: # since we don't want warnings to become errors # while developing) RUSTFLAGS: -Dwarnings - # sccache config (only populated for internal branches; secrets aren't - # available to forked PRs, and blacksmith stickydisk requires a - # blacksmith runner) - SCCACHE_DIR: ${{ needs.skip-if-clean.outputs.internal == 'true' && '/mnt/sccache' || '' }} - SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '10G' || '' }} - SCCACHE_MULTILEVEL_CHAIN: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'disk,s3' || '' }} - SCCACHE_S3_KEY_PREFIX: ${{ needs.skip-if-clean.outputs.internal == 'true' && format('{0}/', github.repository) || '' }} - SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }} - SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }} - SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }} - AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }} - RUSTC_WRAPPER: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'sccache' || '' }} steps: - name: Check out code @@ -141,17 +128,6 @@ jobs: ~/.cargo/bin key: ${{ runner.os }}-${{ runner.arch }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - name: Mount sccache disk cache - if: needs.skip-if-clean.outputs.internal == 'true' - uses: useblacksmith/stickydisk@13af8883542ca949a717e70fef89d15edbb29d88 # v1.2.0 - with: - key: ${{ github.repository }}-turbo-sccache - path: /mnt/sccache - - - name: Setup sccache - if: needs.skip-if-clean.outputs.internal == 'true' - uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10 - - name: Setup binstall uses: cargo-bins/cargo-binstall@dc19f1e48450eefe5a29b8da6c6b00a87d730b37 # v1.18.1 From 076aaac3eb6c8c49129c8c664b7a9eec776ce343 Mon Sep 17 00:00:00 2001 From: "Michael H." Date: Fri, 26 Jun 2026 17:40:16 +0200 Subject: [PATCH 2/3] test: remove mold --- .github/workflows/daedalus-docker.yml | 3 --- .github/workflows/labrinth-docker.yml | 3 --- .github/workflows/theseus-build.yml | 4 ---- .github/workflows/turbo-ci.yml | 3 --- 4 files changed, 13 deletions(-) diff --git a/.github/workflows/daedalus-docker.yml b/.github/workflows/daedalus-docker.yml index b196184160..ba78555e58 100644 --- a/.github/workflows/daedalus-docker.yml +++ b/.github/workflows/daedalus-docker.yml @@ -85,9 +85,6 @@ jobs: rustflags: '' cache: false - - name: Setup mold - uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 / Mold 2.41.0 - - name: Cache Cargo registry and index uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 with: diff --git a/.github/workflows/labrinth-docker.yml b/.github/workflows/labrinth-docker.yml index 5d31203e6b..2dcd655ab6 100644 --- a/.github/workflows/labrinth-docker.yml +++ b/.github/workflows/labrinth-docker.yml @@ -86,9 +86,6 @@ jobs: rustflags: '' cache: false - - name: Setup mold - uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 / Mold 2.41.0 - - name: Install build dependencies uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # v1.6.0 with: diff --git a/.github/workflows/theseus-build.yml b/.github/workflows/theseus-build.yml index 011176f68c..38f214bbf9 100644 --- a/.github/workflows/theseus-build.yml +++ b/.github/workflows/theseus-build.yml @@ -74,10 +74,6 @@ jobs: rustflags: '' target: ${{ contains(matrix.platform, 'macos') && 'x86_64-apple-darwin' || '' }} - - name: Setup mold - if: contains(matrix.platform, 'ubuntu') - uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 / Mold 2.41.0 - - name: Enable Corepack run: corepack enable diff --git a/.github/workflows/turbo-ci.yml b/.github/workflows/turbo-ci.yml index dfa18abbbf..d0fcec458a 100644 --- a/.github/workflows/turbo-ci.yml +++ b/.github/workflows/turbo-ci.yml @@ -116,9 +116,6 @@ jobs: components: clippy, rustfmt cache: false - - name: Setup mold - uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1 / Mold 2.41.0 - - name: Cache Cargo registry and index uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae #v5.0.5 with: From d019ac7fcf374752e6d1f7e08ddb2582c2f6ba6e Mon Sep 17 00:00:00 2001 From: "Michael H." Date: Fri, 26 Jun 2026 17:45:37 +0200 Subject: [PATCH 3/3] test: remove blacksmith --- .github/workflows/turbo-ci.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/turbo-ci.yml b/.github/workflows/turbo-ci.yml index d0fcec458a..ae445b2482 100644 --- a/.github/workflows/turbo-ci.yml +++ b/.github/workflows/turbo-ci.yml @@ -18,25 +18,11 @@ jobs: runs-on: ubuntu-latest outputs: skip: ${{ steps.check.outputs.skip }} - internal: ${{ steps.check-internal.outputs.internal }} if: ${{ always() }} steps: - name: Checkout uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - name: Check if workflow runs on an internal branch - id: check-internal - env: - EVENT_NAME: ${{ github.event_name }} - HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }} - REPO: ${{ github.repository }} - run: | - if [ "$EVENT_NAME" != "pull_request" ] || [ "$HEAD_REPO" = "$REPO" ]; then - echo "internal=true" >> $GITHUB_OUTPUT - else - echo "internal=false" >> $GITHUB_OUTPUT - fi - - name: Merge Queue CI Check Skipper id: merge-queue-ci-skipper uses: ./.github/merge-queue-ci-skipper @@ -62,7 +48,7 @@ jobs: build: name: Lint and Test - runs-on: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'blacksmith-4vcpu-ubuntu-2404' || 'ubuntu-latest' }} + runs-on: ubuntu-latest needs: [skip-if-clean] if: ${{ needs.skip-if-clean.outputs.skip != 'true' }}