Skip to content

Commit dff0249

Browse files
committed
Try it on macOS, unpin version (trust Mozilla).
1 parent 1084929 commit dff0249

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,6 @@ jobs:
101101
python-version: '3.x'
102102
- name: Runner image version
103103
run: echo "IMAGE_VERSION=${ImageVersion}" >> "$GITHUB_ENV"
104-
- name: Run sccache-cache
105-
uses: mozilla-actions/[email protected]
106-
with:
107-
version: "v0.8.2"
108-
- name: Configure CC and CXX environment variables
109-
run: |
110-
echo "CC=sccache gcc" >> "$GITHUB_ENV"
111-
echo "CXX=sccache gcc" >> "$GITHUB_ENV"
112104
- name: Restore config.cache
113105
uses: actions/cache@v4
114106
with:
@@ -117,6 +109,12 @@ jobs:
117109
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }}
118110
- name: Install Dependencies
119111
run: sudo ./.github/workflows/posix-deps-apt.sh
112+
- name: Start sccache-cache
113+
uses: mozilla-actions/[email protected]
114+
- name: Configure CC and CXX environment variables
115+
run: |
116+
echo "CC=sccache gcc" >> "$GITHUB_ENV"
117+
echo "CXX=sccache gcc" >> "$GITHUB_ENV"
120118
- name: Configure CPython
121119
run: |
122120
# Build Python with the libpython dynamic library

.github/workflows/reusable-macos.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
HOMEBREW_NO_INSTALL_CLEANUP: 1
2626
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
2727
PYTHONSTRICTEXTENSIONBUILD: 1
28+
SCCACHE_GHA_ENABLED: "true"
2829
TERM: linux
2930
runs-on: ${{ inputs.os }}
3031
steps:
@@ -41,6 +42,12 @@ jobs:
4142
brew install pkg-config [email protected] xz gdbm tcl-tk@8 make
4243
# Because alternate versions are not symlinked into place by default:
4344
brew link tcl-tk@8
45+
- name: Start sccache-cache
46+
uses: mozilla-actions/[email protected]
47+
- name: Configure CC and CXX environment variables
48+
run: |
49+
echo "CC=sccache clang" >> "$GITHUB_ENV"
50+
echo "CXX=sccache clang" >> "$GITHUB_ENV"
4451
- name: Configure CPython
4552
run: |
4653
GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \

.github/workflows/reusable-ubuntu.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,20 @@ jobs:
2525
FORCE_COLOR: 1
2626
OPENSSL_VER: 3.0.15
2727
PYTHONSTRICTEXTENSIONBUILD: 1
28-
TERM: linux
2928
SCCACHE_GHA_ENABLED: "true"
29+
TERM: linux
3030
steps:
3131
- uses: actions/checkout@v4
3232
- name: Register gcc problem matcher
3333
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
34-
- name: Run sccache-cache
34+
- name: Install dependencies
35+
run: sudo ./.github/workflows/posix-deps-apt.sh
36+
- name: Start sccache-cache
3537
uses: mozilla-actions/[email protected]
36-
with:
37-
version: "v0.8.2"
3838
- name: Configure CC and CXX environment variables
3939
run: |
4040
echo "CC=sccache gcc" >> "$GITHUB_ENV"
4141
echo "CXX=sccache gcc" >> "$GITHUB_ENV"
42-
- name: Install dependencies
43-
run: sudo ./.github/workflows/posix-deps-apt.sh
4442
- name: Configure OpenSSL env vars
4543
run: |
4644
echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"

0 commit comments

Comments
 (0)