more consistency (more could be templated?)

Author: gpshead

.github/workflows/build.yml

@@ -92,8 +92,6 @@ jobs:
     timeout-minutes: 60
     needs: check_source
     if: needs.check_source.outputs.run_tests == 'true'
-    env:
-      SCCACHE_GHA_ENABLED: "true"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -111,10 +109,11 @@ jobs:
         run: sudo ./.github/workflows/posix-deps-apt.sh
       - name: Start sccache-cache
         uses: mozilla-actions/[email protected]
-      - name: Configure CC and CXX environment variables
+      - name: Configure CC and CXX env vars
         run: |
           echo "CC=sccache gcc" >> "$GITHUB_ENV"
           echo "CXX=sccache gcc" >> "$GITHUB_ENV"
+          echo "SCCACHE_GHA_ENABLED=true" >> "$GITHUB_ENV"
       - name: Configure CPython
         run: |
           # Build Python with the libpython dynamic library
@@ -286,13 +285,13 @@ jobs:
     - name: Install OpenSSL
       if: steps.cache-openssl.outputs.cache-hit != 'true'
       run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
-    - name: Add ccache to PATH
+    - name: Start sccache-cache
+      uses: mozilla-actions/[email protected]
+    - name: Configure CC and CXX env vars
       run: |
-        echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
-    - name: Configure ccache action
-      uses: hendrikmuhs/[email protected]
-      with:
-        save: false
+        echo "CC=sccache gcc" >> "$GITHUB_ENV"
+        echo "CXX=sccache gcc" >> "$GITHUB_ENV"
+        echo "SCCACHE_GHA_ENABLED=true" >> "$GITHUB_ENV"
     - name: Configure CPython
       run: ./configure CFLAGS="-fdiagnostics-format=json" --config-cache --enable-slower-safety --with-pydebug --with-openssl="$OPENSSL_DIR"
     - name: Build CPython
@@ -339,13 +338,13 @@ jobs:
     - name: Install OpenSSL
       if: steps.cache-openssl.outputs.cache-hit != 'true'
       run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
-    - name: Add ccache to PATH
+    - name: Start sccache-cache
+      uses: mozilla-actions/[email protected]
+    - name: Configure CC and CXX env vars
       run: |
-        echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
-    - name: Configure ccache action
-      uses: hendrikmuhs/[email protected]
-      with:
-        save: false
+        echo "CC=sccache gcc" >> "$GITHUB_ENV"
+        echo "CXX=sccache gcc" >> "$GITHUB_ENV"
+        echo "SCCACHE_GHA_ENABLED=true" >> "$GITHUB_ENV"
     - name: Setup directory envs for out-of-tree builds
       run: |
         echo "CPYTHON_RO_SRCDIR=$(realpath -m "${GITHUB_WORKSPACE}"/../cpython-ro-srcdir)" >> "$GITHUB_ENV"
@@ -468,14 +467,13 @@ jobs:
     - name: Install OpenSSL
       if: steps.cache-openssl.outputs.cache-hit != 'true'
       run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
-    - name: Add ccache to PATH
+    - name: Start sccache-cache
+      uses: mozilla-actions/[email protected]
+    - name: Configure CC and CXX env vars
       run: |
-        echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
-    - name: Configure ccache action
-      uses: hendrikmuhs/[email protected]
-      with:
-        save: ${{ github.event_name == 'push' }}
-        max-size: "200M"
+        echo "CC=sccache gcc" >> "$GITHUB_ENV"
+        echo "CXX=sccache gcc" >> "$GITHUB_ENV"
+        echo "SCCACHE_GHA_ENABLED=true" >> "$GITHUB_ENV"
     - name: Configure CPython
       run: ./configure --config-cache --with-address-sanitizer --without-pymalloc
     - name: Build CPython

.github/workflows/reusable-macos.yml

@@ -25,7 +25,6 @@ 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:
@@ -44,10 +43,11 @@ jobs:
         brew link tcl-tk@8
     - name: Start sccache-cache
       uses: mozilla-actions/[email protected]
-    - name: Configure CC and CXX environment variables
+    - name: Configure CC and CXX env vars
       run: |
         echo "CC=sccache clang" >> "$GITHUB_ENV"
         echo "CXX=sccache clang" >> "$GITHUB_ENV"
+        echo "SCCACHE_GHA_ENABLED=true" >> "$GITHUB_ENV"
     - name: Configure CPython
       run: |
         GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \

.github/workflows/reusable-tsan.yml

@@ -45,19 +45,14 @@ jobs:
         sudo update-alternatives --set clang++ /usr/bin/clang++-17
         # Reduce ASLR to avoid TSAN crashing
         sudo sysctl -w vm.mmap_rnd_bits=28
+    - name: Start sccache-cache
+      uses: mozilla-actions/[email protected]
     - name: TSAN Option Setup
       run: |
         echo "TSAN_OPTIONS=log_path=${GITHUB_WORKSPACE}/tsan_log suppressions=${GITHUB_WORKSPACE}/${{ inputs.suppressions_path }} handle_segv=0" >> "$GITHUB_ENV"
-        echo "CC=clang" >> "$GITHUB_ENV"
-        echo "CXX=clang++" >> "$GITHUB_ENV"
-    - name: Add ccache to PATH
-      run: |
-        echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
-    - name: Configure ccache action
-      uses: hendrikmuhs/[email protected]
-      with:
-        save: ${{ github.event_name == 'push' }}
-        max-size: "200M"
+        echo "CC=sccache clang" >> "$GITHUB_ENV"
+        echo "CXX=sccache clang++" >> "$GITHUB_ENV"
+        echo "SCCACHE_GHA_ENABLED=true" >> "$GITHUB_ENV"
     - name: Configure CPython
       run: ${{ inputs.options }}
     - name: Build CPython

.github/workflows/reusable-ubuntu.yml

@@ -25,7 +25,6 @@ jobs:
       FORCE_COLOR: 1
       OPENSSL_VER: 3.0.15
       PYTHONSTRICTEXTENSIONBUILD: 1
-      SCCACHE_GHA_ENABLED: "true"
       TERM: linux
     steps:
     - uses: actions/checkout@v4
@@ -35,10 +34,11 @@ jobs:
       run: sudo ./.github/workflows/posix-deps-apt.sh
     - name: Start sccache-cache
       uses: mozilla-actions/[email protected]
-    - name: Configure CC and CXX environment variables
+    - name: Configure CC and CXX env vars
       run: |
         echo "CC=sccache gcc" >> "$GITHUB_ENV"
         echo "CXX=sccache gcc" >> "$GITHUB_ENV"
+        echo "SCCACHE_GHA_ENABLED=true" >> "$GITHUB_ENV"
     - name: Configure OpenSSL env vars
       run: |
         echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"