GHA

BrowserWorks · Aug 23, 2023 · 36fd567 · 36fd567
1 parent 3ba8679
commit 36fd567
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -79,7 +79,7 @@ jobs:
       ARCH: x86_64-pc-mingw32
       CARGO_INCREMENTAL: "0"
       CARGO_TERM_COLOR: always
-      SCCACHE_BUCKET: "waterfox-cache-win-x64"
+      SCCACHE_BUCKET: "waterfox-cache-win-x64-stage-1"
       SCCACHE_ENDPOINT: "${{ secrets.CF_ENDPOINT }}"
       SCCACHE_REGION: auto
     outputs:
@@ -114,15 +114,15 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${HOME}/win-cross
-          key: clang-16
+          key: clang-17
       - name: "\U0001F4BF Setup win-cross"
         if: steps.cache-win-cross.outputs.cache-hit != 'true'
         run: |
           rclone copyto :s3:cdn/waterfox/libraries/toolchain/win-cross-102.tar.zst ./win-cross.tar.zst
           tar -xvf win-cross.tar.zst -C $HOME/
-          rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-16.tar.zst ./clang-16.tar.zst
+          rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-17.tar.zst ./clang-17.tar.zst
           mkdir -p $HOME/win-cross
-          tar -xvf clang-16.tar.zst -C $HOME/win-cross
+          tar -xvf clang-17.tar.zst -C $HOME/win-cross
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v3
       - name: "\U0001F4E3 Override version_display.txt"
@@ -225,7 +225,7 @@ jobs:
       ARCH: x86_64-pc-mingw32
       CARGO_INCREMENTAL: "0"
       CARGO_TERM_COLOR: always
-      SCCACHE_BUCKET: "waterfox-cache-win-x64"
+      SCCACHE_BUCKET: "waterfox-cache-win-x64-stage-3"
       SCCACHE_ENDPOINT: "${{ secrets.CF_ENDPOINT }}"
       SCCACHE_REGION: auto
     steps:
@@ -266,9 +266,9 @@ jobs:
         run: |
           rclone copyto :s3:cdn/waterfox/libraries/toolchain/win-cross-102.tar.zst ./win-cross.tar.zst
           tar -xvf win-cross.tar.zst -C $HOME/
-          rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-16.tar.zst ./clang-16.tar.zst
+          rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-17.tar.zst ./clang-17.tar.zst
           mkdir -p $HOME/win-cross
-          tar -xvf clang-16.tar.zst -C $HOME/win-cross
+          tar -xvf clang-17.tar.zst -C $HOME/win-cross
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v3
       - name: "\U0001F4E3 Override version_display.txt"
@@ -491,11 +491,11 @@ jobs:
       - name: Export sccache bucket
         if: "${{ matrix.ARCH == 'x86_64-apple-darwin' }}"
         run: |
-          echo "SCCACHE_BUCKET=waterfox-cache-mac-x64" >> $GITHUB_ENV
+          echo "SCCACHE_BUCKET=waterfox-cache-mac-x64-stage-1" >> $GITHUB_ENV
       - name: Export sccache bucket
         if: "${{ matrix.ARCH == 'aarch64-apple-darwin' }}"
         run: |
-          echo "SCCACHE_BUCKET=waterfox-cache-mac-aarch64" >> $GITHUB_ENV
+          echo "SCCACHE_BUCKET=waterfox-cache-mac-aarch64-stage-1" >> $GITHUB_ENV
       - name: Start sccache server
         if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
         run: sccache --start-server
@@ -520,8 +520,8 @@ jobs:
         run: |
           rclone copyto :s3:cdn/waterfox/libraries/toolchain/macos-cross-102.tar.zst ./macos-cross.tar.zst
           tar -xvf macos-cross.tar.zst -C $HOME/
-          rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-16.tar.zst ./clang-16.tar.zst
-          tar -xvf clang-16.tar.zst -C $HOME/macos-cross
+          rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-17.tar.zst ./clang-17.tar.zst
+          tar -xvf clang-17.tar.zst -C $HOME/macos-cross
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v3
       - name: "\U0001F4E3 Override version_display.txt"
@@ -642,11 +642,11 @@ jobs:
       - name: Export sccache bucket
         if: "${{ matrix.ARCH == 'x86_64-apple-darwin' }}"
         run: |
-          echo "SCCACHE_BUCKET=waterfox-cache-mac-x64" >> $GITHUB_ENV
+          echo "SCCACHE_BUCKET=waterfox-cache-mac-x64-stage-3" >> $GITHUB_ENV
       - name: Export sccache bucket
         if: "${{ matrix.ARCH == 'aarch64-apple-darwin' }}"
         run: |
-          echo "SCCACHE_BUCKET=waterfox-cache-mac-aarch64" >> $GITHUB_ENV
+          echo "SCCACHE_BUCKET=waterfox-cache-mac-aarch64-stage-3" >> $GITHUB_ENV
       - name: Start sccache server
         if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
         run: sccache --start-server
@@ -671,8 +671,8 @@ jobs:
         run: |
           rclone copyto :s3:cdn/waterfox/libraries/toolchain/macos-cross-102.tar.zst ./macos-cross.tar.zst
           tar -xvf macos-cross.tar.zst -C $HOME/
-          rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-16.tar.zst ./clang-16.tar.zst
-          tar -xvf clang-16.tar.zst -C $HOME/macos-cross
+          rclone copyto :s3:cdn/waterfox/libraries/toolchain/clang-17.tar.zst ./clang-17.tar.zst
+          tar -xvf clang-17.tar.zst -C $HOME/macos-cross
       - name: "\U0001F4E4 Checkout"
         uses: actions/checkout@v3
       - name: "\U0001F4E3 Override version_display.txt"
@@ -887,7 +887,7 @@ jobs:
       ARCH: x86_64-pc-linux-gnu
       CARGO_INCREMENTAL: "0"
       CARGO_TERM_COLOR: always
-      SCCACHE_BUCKET: "waterfox-cache-linux-x64"
+      SCCACHE_BUCKET: "waterfox-cache-linux-x64-stage-1"
       SCCACHE_ENDPOINT: "${{ secrets.CF_ENDPOINT }}"
       SCCACHE_REGION: auto
     steps:
@@ -948,6 +948,8 @@ jobs:
           ./mach clobber
       - name: "\U0001F3D7 Build Stage 3"
         if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
+        env:
+          SCCACHE_BUCKET: "waterfox-cache-linux-x64-stage-3"
         run: |
           if [[ $PRE_RELEASE == 'true' ]]; then
             export WFX_PRE_RELEASE=1