Try it on macOS, unpin version (trust Mozilla).

gpshead · Nov 28, 2024 · dff0249 · dff0249
1 parent 1084929
commit dff0249
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -101,14 +101,6 @@ jobs:
           python-version: '3.x'
       - name: Runner image version
         run: echo "IMAGE_VERSION=${ImageVersion}" >> "$GITHUB_ENV"
-      - name: Run sccache-cache
-        uses: mozilla-actions/sccache-action@v0.0.6
-        with:
-          version: "v0.8.2"
-      - name: Configure CC and CXX environment variables
-        run: |
-          echo "CC=sccache gcc" >> "$GITHUB_ENV"
-          echo "CXX=sccache gcc" >> "$GITHUB_ENV"
       - name: Restore config.cache
         uses: actions/cache@v4
         with:
@@ -117,6 +109,12 @@ jobs:
           key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }}
       - name: Install Dependencies
         run: sudo ./.github/workflows/posix-deps-apt.sh
+      - name: Start sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.6
+      - name: Configure CC and CXX environment variables
+        run: |
+          echo "CC=sccache gcc" >> "$GITHUB_ENV"
+          echo "CXX=sccache gcc" >> "$GITHUB_ENV"
       - name: Configure CPython
         run: |
           # Build Python with the libpython dynamic library

diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml
@@ -25,6 +25,7 @@ jobs:
       HOMEBREW_NO_INSTALL_CLEANUP: 1
       HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
       PYTHONSTRICTEXTENSIONBUILD: 1
+      SCCACHE_GHA_ENABLED: "true"
       TERM: linux
     runs-on: ${{ inputs.os }}
     steps:
@@ -41,6 +42,12 @@ jobs:
         brew install pkg-config openssl@3.0 xz gdbm tcl-tk@8 make
         # Because alternate versions are not symlinked into place by default:
         brew link tcl-tk@8
+    - name: Start sccache-cache
+      uses: mozilla-actions/sccache-action@v0.0.6
+    - name: Configure CC and CXX environment variables
+      run: |
+        echo "CC=sccache clang" >> "$GITHUB_ENV"
+        echo "CXX=sccache clang" >> "$GITHUB_ENV"
     - name: Configure CPython
       run: |
         GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \

diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
@@ -25,22 +25,20 @@ jobs:
       FORCE_COLOR: 1
       OPENSSL_VER: 3.0.15
       PYTHONSTRICTEXTENSIONBUILD: 1
-      TERM: linux
       SCCACHE_GHA_ENABLED: "true"
+      TERM: linux
     steps:
     - uses: actions/checkout@v4
     - name: Register gcc problem matcher
       run: echo "::add-matcher::.github/problem-matchers/gcc.json"
-    - name: Run sccache-cache
+    - name: Install dependencies
+      run: sudo ./.github/workflows/posix-deps-apt.sh
+    - name: Start sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.6
-      with:
-        version: "v0.8.2"
     - name: Configure CC and CXX environment variables
       run: |
         echo "CC=sccache gcc" >> "$GITHUB_ENV"
         echo "CXX=sccache gcc" >> "$GITHUB_ENV"
-    - name: Install dependencies
-      run: sudo ./.github/workflows/posix-deps-apt.sh
     - name: Configure OpenSSL env vars
       run: |
         echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"