sccache

phusion · Oct 8, 2024 · 6a4260c · 6a4260c
1 parent 42891d6
commit 6a4260c
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
       EXTRA_CFLAGS: '-fdiagnostics-color'
       EXTRA_CXXFLAGS: '-fdiagnostics-color'
       SCCACHE_AZURE_BLOB_CONTAINER: ${{ vars.SCCACHE_AZURE_BLOB_CONTAINER }}
-      SCCACHE_AZURE_KEY_PREFIX: sccache/cxx-ubuntu-24.04
+      SCCACHE_AZURE_KEY_PREFIX: sccache/cxx-ubuntu
     steps:
       - uses: actions/checkout@v4
         with:
@@ -81,7 +81,7 @@ jobs:
       EXTRA_CFLAGS: '-I/opt/homebrew/opt/openssl@3/include -fcolor-diagnostics'
       EXTRA_CXXFLAGS: '-I/opt/homebrew/opt/openssl@3/include -fcolor-diagnostics'
       SCCACHE_AZURE_BLOB_CONTAINER: ${{ vars.SCCACHE_AZURE_BLOB_CONTAINER }}
-      SCCACHE_AZURE_KEY_PREFIX: sccache/cxx-macos-14
+      SCCACHE_AZURE_KEY_PREFIX: sccache/cxx-macos-14-arm
     steps:
       - uses: actions/checkout@v4
         with:
@@ -147,13 +147,13 @@ jobs:
             config_file: test/config.json.github-ci-linux
             extra_cflags: '-fdiagnostics-color'
             sccache_arch_and_os: x86_64-unknown-linux-musl
-            sccache_azure_key_prefix: sccache/cxx-ubuntu-24.04
+            sccache_azure_key_prefix: sccache/cxx-ubuntu-24.04-x86_64
           - name: macOS
             os: macos-14
             config_file: test/config.json.github-ci-macos
             extra_cflags: '-I/opt/homebrew/opt/openssl@3/include -fcolor-diagnostics'
             sccache_arch_and_os: aarch64-apple-darwin
-            sccache_azure_key_prefix: sccache/cxx-macos-14
+            sccache_azure_key_prefix: sccache/cxx-macos-14-arm
     runs-on: ${{ matrix.os }}
     env:
       EXTRA_CFLAGS: ${{ matrix.extra_cflags }}
@@ -223,7 +223,7 @@ jobs:
           SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.AZURE_CI_STORAGE_CONNECTION_STRING }}
 
       - name: Test module installation as root
-        run: sudo -E ./bin/passenger-install-apache2-module --auto --force-colors --verbose-depcheck
+        run: sudo -E ./bin/passenger-install-apache2-module --auto --force-colors
 
       - name: Teardown sccache as root
         run: ./dev/ci/teardown-sccache
@@ -252,13 +252,13 @@ jobs:
             config_file: test/config.json.github-ci-linux
             extra_cflags: '-fdiagnostics-color'
             sccache_arch_and_os: x86_64-unknown-linux-musl
-            sccache_azure_key_prefix: sccache/cxx-ubuntu-24.04
+            sccache_azure_key_prefix: sccache/cxx-ubuntu-24.04-x86_64
           - name: macOS
             os: macos-14
             config_file: test/config.json.github-ci-macos
             extra_cflags: '-I/opt/homebrew/opt/openssl@3/include -fcolor-diagnostics'
             sccache_arch_and_os: aarch64-apple-darwin
-            sccache_azure_key_prefix: sccache/cxx-macos-14
+            sccache_azure_key_prefix: sccache/cxx-macos-14-arm
     runs-on: ${{ matrix.os }}
     env:
       EXTRA_CFLAGS: ${{ matrix.extra_cflags }}
@@ -336,12 +336,12 @@ jobs:
             os: ubuntu-24.04
             extra_cflags: '-fdiagnostics-color'
             sccache_arch_and_os: x86_64-unknown-linux-musl
-            sccache_azure_key_prefix: sccache/cxx-ubuntu-24.04
+            sccache_azure_key_prefix: sccache/cxx-ubuntu-24.04-x86_64
           - name: macOS
             os: macos-14
             extra_cflags: '-I/opt/homebrew/opt/openssl@3/include -fcolor-diagnostics'
             sccache_arch_and_os: aarch64-apple-darwin
-            sccache_azure_key_prefix: sccache/cxx-macos-14
+            sccache_azure_key_prefix: sccache/cxx-macos-14-arm
     runs-on: ${{ matrix.os }}
     env:
       EXTRA_CFLAGS: ${{ matrix.extra_cflags }}
@@ -412,12 +412,12 @@ jobs:
             os: ubuntu-24.04
             extra_cflags: '-fdiagnostics-color'
             sccache_arch_and_os: x86_64-unknown-linux-musl
-            sccache_azure_key_prefix: sccache/cxx-ubuntu-24.04
+            sccache_azure_key_prefix: sccache/cxx-ubuntu-24.04-x86_64
           - name: macOS
             os: macos-14
             extra_cflags: '-I/opt/homebrew/opt/openssl@3/include -fcolor-diagnostics'
             sccache_arch_and_os: aarch64-apple-darwin
-            sccache_azure_key_prefix: sccache/cxx-macos-14
+            sccache_azure_key_prefix: sccache/cxx-macos-14-arm
     runs-on: ${{ matrix.os }}
     env:
       EXTRA_CFLAGS: ${{ matrix.extra_cflags }}
@@ -471,13 +471,13 @@ jobs:
             config_file: test/config.json.github-ci-linux
             extra_cflags: '-fdiagnostics-color'
             sccache_arch_and_os: x86_64-unknown-linux-musl
-            sccache_azure_key_prefix: sccache/cxx-ubuntu-24.04
+            sccache_azure_key_prefix: sccache/cxx-ubuntu-24.04-x86_64
           - name: macOS
             os: macos-14
             config_file: test/config.json.github-ci-macos
             extra_cflags: '-I/opt/homebrew/opt/openssl@3/include -fcolor-diagnostics'
             sccache_arch_and_os: aarch64-apple-darwin
-            sccache_azure_key_prefix: sccache/cxx-macos-14
+            sccache_azure_key_prefix: sccache/cxx-macos-14-arm
     runs-on: ${{ matrix.os }}
     env:
       EXTRA_CFLAGS: ${{ matrix.extra_cflags }}