Skip to content

Commit fefd2c5

Browse files
hugovkhugovk
authored
[3.13] CI: Use ImageOS (ubuntu24) instead of runner.os (Linux) in cache keys (pythonGH-130200) (python#130222)
1 parent 1b2cfb7 commit fefd2c5

File tree

5 files changed

+63
-63
lines changed

5 files changed

+63
-63
lines changed

‎.github/workflows/build.yml‎

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ jobs:
107107
with:
108108
fetch-depth: 1
109109
persist-credentials: false
110-
- name: Runner image version
111-
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
112110
- name: Check Autoconf and aclocal versions
113111
run: |
114112
grep "Generated by GNU Autoconf 2.71" configure
@@ -149,17 +147,17 @@ jobs:
149147
with:
150148
python-version: '3.x'
151149
- name: Runner image version
152-
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
150+
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
153151
- name: Restore config.cache
154152
uses: actions/cache@v4
155153
with:
156154
path: config.cache
157155
# Include env.pythonLocation in key to avoid changes in environment when setup-python updates Python
158-
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }}
159-
- name: Install Dependencies
156+
key: ${{ github.job }}-${{ env.IMAGE_OS_VERSION }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }}
157+
- name: Install dependencies
160158
run: sudo ./.github/workflows/posix-deps-apt.sh
161159
- name: Add ccache to PATH
162-
run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
160+
run: echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
163161
- name: Configure ccache action
164162
uses: hendrikmuhs/[email protected]
165163
with:
@@ -312,21 +310,21 @@ jobs:
312310
with:
313311
persist-credentials: false
314312
- name: Runner image version
315-
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
313+
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
316314
- name: Restore config.cache
317315
uses: actions/cache@v4
318316
with:
319317
path: config.cache
320-
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}
318+
key: ${{ github.job }}-${{ env.IMAGE_OS_VERSION }}-${{ needs.check_source.outputs.config_hash }}
321319
- name: Register gcc problem matcher
322320
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
323-
- name: Install Dependencies
321+
- name: Install dependencies
324322
run: sudo ./.github/workflows/posix-deps-apt.sh
325323
- name: Configure OpenSSL env vars
326324
run: |
327-
echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> $GITHUB_ENV
328-
echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> $GITHUB_ENV
329-
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
325+
echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"
326+
echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> "$GITHUB_ENV"
327+
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> "$GITHUB_ENV"
330328
- name: 'Restore OpenSSL build'
331329
id: cache-openssl
332330
uses: actions/cache@v4
@@ -335,10 +333,10 @@ jobs:
335333
key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
336334
- name: Install OpenSSL
337335
if: steps.cache-openssl.outputs.cache-hit != 'true'
338-
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux
336+
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
339337
- name: Add ccache to PATH
340338
run: |
341-
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
339+
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
342340
- name: Configure ccache action
343341
uses: hendrikmuhs/[email protected]
344342
with:
@@ -375,13 +373,13 @@ jobs:
375373
persist-credentials: false
376374
- name: Register gcc problem matcher
377375
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
378-
- name: Install Dependencies
376+
- name: Install dependencies
379377
run: sudo ./.github/workflows/posix-deps-apt.sh
380378
- name: Configure OpenSSL env vars
381379
run: |
382-
echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> $GITHUB_ENV
383-
echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> $GITHUB_ENV
384-
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
380+
echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"
381+
echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> "$GITHUB_ENV"
382+
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> "$GITHUB_ENV"
385383
- name: 'Restore OpenSSL build'
386384
id: cache-openssl
387385
uses: actions/cache@v4
@@ -393,33 +391,33 @@ jobs:
393391
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux
394392
- name: Add ccache to PATH
395393
run: |
396-
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
394+
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
397395
- name: Configure ccache action
398396
uses: hendrikmuhs/[email protected]
399397
with:
400398
save: false
401399
- name: Setup directory envs for out-of-tree builds
402400
run: |
403-
echo "CPYTHON_RO_SRCDIR=$(realpath -m ${GITHUB_WORKSPACE}/../cpython-ro-srcdir)" >> $GITHUB_ENV
404-
echo "CPYTHON_BUILDDIR=$(realpath -m ${GITHUB_WORKSPACE}/../cpython-builddir)" >> $GITHUB_ENV
401+
echo "CPYTHON_RO_SRCDIR=$(realpath -m "${GITHUB_WORKSPACE}"/../cpython-ro-srcdir)" >> "$GITHUB_ENV"
402+
echo "CPYTHON_BUILDDIR=$(realpath -m "${GITHUB_WORKSPACE}"/../cpython-builddir)" >> "$GITHUB_ENV"
405403
- name: Create directories for read-only out-of-tree builds
406-
run: mkdir -p $CPYTHON_RO_SRCDIR $CPYTHON_BUILDDIR
404+
run: mkdir -p "$CPYTHON_RO_SRCDIR" "$CPYTHON_BUILDDIR"
407405
- name: Bind mount sources read-only
408-
run: sudo mount --bind -o ro $GITHUB_WORKSPACE $CPYTHON_RO_SRCDIR
406+
run: sudo mount --bind -o ro "$GITHUB_WORKSPACE" "$CPYTHON_RO_SRCDIR"
409407
- name: Runner image version
410-
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
408+
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
411409
- name: Restore config.cache
412410
uses: actions/cache@v4
413411
with:
414412
path: ${{ env.CPYTHON_BUILDDIR }}/config.cache
415-
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}
413+
key: ${{ github.job }}-${{ env.IMAGE_OS_VERSION }}-${{ needs.check_source.outputs.config_hash }}
416414
- name: Configure CPython out-of-tree
417415
working-directory: ${{ env.CPYTHON_BUILDDIR }}
418416
run: |
419417
../cpython-ro-srcdir/configure \
420418
--config-cache \
421419
--with-pydebug \
422-
--with-openssl=$OPENSSL_DIR
420+
--with-openssl="$OPENSSL_DIR"
423421
- name: Build CPython out-of-tree
424422
working-directory: ${{ env.CPYTHON_BUILDDIR }}
425423
run: make -j4
@@ -428,18 +426,18 @@ jobs:
428426
run: make pythoninfo
429427
- name: Remount sources writable for tests
430428
# some tests write to srcdir, lack of pyc files slows down testing
431-
run: sudo mount $CPYTHON_RO_SRCDIR -oremount,rw
429+
run: sudo mount "$CPYTHON_RO_SRCDIR" -oremount,rw
432430
- name: Setup directory envs for out-of-tree builds
433431
run: |
434-
echo "CPYTHON_BUILDDIR=$(realpath -m ${GITHUB_WORKSPACE}/../cpython-builddir)" >> $GITHUB_ENV
432+
echo "CPYTHON_BUILDDIR=$(realpath -m "${GITHUB_WORKSPACE}"/../cpython-builddir)" >> "$GITHUB_ENV"
435433
- name: "Create hypothesis venv"
436434
working-directory: ${{ env.CPYTHON_BUILDDIR }}
437435
run: |
438436
VENV_LOC=$(realpath -m .)/hypovenv
439437
VENV_PYTHON=$VENV_LOC/bin/python
440-
echo "HYPOVENV=${VENV_LOC}" >> $GITHUB_ENV
441-
echo "VENV_PYTHON=${VENV_PYTHON}" >> $GITHUB_ENV
442-
./python -m venv $VENV_LOC && $VENV_PYTHON -m pip install -r ${GITHUB_WORKSPACE}/Tools/requirements-hypothesis.txt
438+
echo "HYPOVENV=${VENV_LOC}" >> "$GITHUB_ENV"
439+
echo "VENV_PYTHON=${VENV_PYTHON}" >> "$GITHUB_ENV"
440+
./python -m venv "$VENV_LOC" && "$VENV_PYTHON" -m pip install -r "${GITHUB_WORKSPACE}/Tools/requirements-hypothesis.txt"
443441
- name: 'Restore Hypothesis database'
444442
id: cache-hypothesis-database
445443
uses: actions/cache@v4
@@ -493,25 +491,25 @@ jobs:
493491
with:
494492
persist-credentials: false
495493
- name: Runner image version
496-
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
494+
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
497495
- name: Restore config.cache
498496
uses: actions/cache@v4
499497
with:
500498
path: config.cache
501-
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ needs.check_source.outputs.config_hash }}
499+
key: ${{ github.job }}-${{ env.IMAGE_OS_VERSION }}-${{ needs.check_source.outputs.config_hash }}
502500
- name: Register gcc problem matcher
503501
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
504-
- name: Install Dependencies
502+
- name: Install dependencies
505503
run: sudo ./.github/workflows/posix-deps-apt.sh
506504
- name: Set up GCC-10 for ASAN
507505
uses: egor-tensin/setup-gcc@v1
508506
with:
509507
version: 10
510508
- name: Configure OpenSSL env vars
511509
run: |
512-
echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> $GITHUB_ENV
513-
echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> $GITHUB_ENV
514-
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
510+
echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"
511+
echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> "$GITHUB_ENV"
512+
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> "$GITHUB_ENV"
515513
- name: 'Restore OpenSSL build'
516514
id: cache-openssl
517515
uses: actions/cache@v4
@@ -520,10 +518,10 @@ jobs:
520518
key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
521519
- name: Install OpenSSL
522520
if: steps.cache-openssl.outputs.cache-hit != 'true'
523-
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux
521+
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
524522
- name: Add ccache to PATH
525523
run: |
526-
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
524+
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
527525
- name: Configure ccache action
528526
uses: hendrikmuhs/[email protected]
529527
with:

‎.github/workflows/reusable-macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
with:
3636
persist-credentials: false
3737
- name: Runner image version
38-
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
38+
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
3939
- name: Restore config.cache
4040
uses: actions/cache@v4
4141
with:
4242
path: config.cache
43-
key: ${{ github.job }}-${{ inputs.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
43+
key: ${{ github.job }}-${{ env.IMAGE_OS_VERSION }}-${{ inputs.config_hash }}
4444
- name: Install Homebrew dependencies
4545
run: |
4646
brew install pkg-config [email protected] xz gdbm tcl-tk@8

‎.github/workflows/reusable-tsan.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
with:
2626
persist-credentials: false
2727
- name: Runner image version
28-
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
28+
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
2929
- name: Restore config.cache
3030
uses: actions/cache@v4
3131
with:
3232
path: config.cache
33-
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
34-
- name: Install Dependencies
33+
key: ${{ github.job }}-${{ env.IMAGE_OS_VERSION }}-${{ inputs.config_hash }}
34+
- name: Install dependencies
3535
run: |
3636
sudo ./.github/workflows/posix-deps-apt.sh
3737
# Install clang-18
@@ -44,7 +44,7 @@ jobs:
4444
sudo update-alternatives --set clang++ /usr/bin/clang++-17
4545
# Reduce ASLR to avoid TSAN crashing
4646
sudo sysctl -w vm.mmap_rnd_bits=28
47-
- name: TSAN Option Setup
47+
- name: TSAN option setup
4848
run: |
4949
echo "TSAN_OPTIONS=log_path=${GITHUB_WORKSPACE}/tsan_log suppressions=${GITHUB_WORKSPACE}/Tools/tsan/suppressions${{
5050
fromJSON(inputs.free-threading)
@@ -55,7 +55,7 @@ jobs:
5555
echo "CXX=clang++" >> "$GITHUB_ENV"
5656
- name: Add ccache to PATH
5757
run: |
58-
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
58+
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
5959
- name: Configure ccache action
6060
uses: hendrikmuhs/[email protected]
6161
with:
@@ -76,7 +76,7 @@ jobs:
7676
run: ./python -m test --tsan -j4
7777
- name: Display TSAN logs
7878
if: always()
79-
run: find ${GITHUB_WORKSPACE} -name 'tsan_log.*' | xargs head -n 1000
79+
run: find "${GITHUB_WORKSPACE}" -name 'tsan_log.*' | xargs head -n 1000
8080
- name: Archive TSAN logs
8181
if: always()
8282
uses: actions/upload-artifact@v4

‎.github/workflows/reusable-ubuntu.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
run: sudo ./.github/workflows/posix-deps-apt.sh
3939
- name: Configure OpenSSL env vars
4040
run: |
41-
echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> $GITHUB_ENV
42-
echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> $GITHUB_ENV
43-
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV
41+
echo "MULTISSL_DIR=${GITHUB_WORKSPACE}/multissl" >> "$GITHUB_ENV"
42+
echo "OPENSSL_DIR=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}" >> "$GITHUB_ENV"
43+
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> "$GITHUB_ENV"
4444
- name: 'Restore OpenSSL build'
4545
id: cache-openssl
4646
uses: actions/cache@v4
@@ -49,37 +49,37 @@ jobs:
4949
key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
5050
- name: Install OpenSSL
5151
if: steps.cache-openssl.outputs.cache-hit != 'true'
52-
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux
52+
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
5353
- name: Add ccache to PATH
5454
run: |
55-
echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
55+
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
5656
- name: Configure ccache action
5757
uses: hendrikmuhs/[email protected]
5858
with:
5959
save: ${{ github.event_name == 'push' }}
6060
max-size: "200M"
6161
- name: Setup directory envs for out-of-tree builds
6262
run: |
63-
echo "CPYTHON_RO_SRCDIR=$(realpath -m ${GITHUB_WORKSPACE}/../cpython-ro-srcdir)" >> $GITHUB_ENV
64-
echo "CPYTHON_BUILDDIR=$(realpath -m ${GITHUB_WORKSPACE}/../cpython-builddir)" >> $GITHUB_ENV
63+
echo "CPYTHON_RO_SRCDIR=$(realpath -m "${GITHUB_WORKSPACE}"/../cpython-ro-srcdir)" >> "$GITHUB_ENV"
64+
echo "CPYTHON_BUILDDIR=$(realpath -m "${GITHUB_WORKSPACE}"/../cpython-builddir)" >> "$GITHUB_ENV"
6565
- name: Create directories for read-only out-of-tree builds
66-
run: mkdir -p $CPYTHON_RO_SRCDIR $CPYTHON_BUILDDIR
66+
run: mkdir -p "$CPYTHON_RO_SRCDIR" "$CPYTHON_BUILDDIR"
6767
- name: Bind mount sources read-only
68-
run: sudo mount --bind -o ro $GITHUB_WORKSPACE $CPYTHON_RO_SRCDIR
68+
run: sudo mount --bind -o ro "$GITHUB_WORKSPACE" "$CPYTHON_RO_SRCDIR"
6969
- name: Runner image version
70-
run: echo "IMAGE_VERSION=${ImageVersion}" >> $GITHUB_ENV
70+
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
7171
- name: Restore config.cache
7272
uses: actions/cache@v4
7373
with:
7474
path: ${{ env.CPYTHON_BUILDDIR }}/config.cache
75-
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
75+
key: ${{ github.job }}-${{ env.IMAGE_OS_VERSION }}-${{ inputs.config_hash }}
7676
- name: Configure CPython out-of-tree
7777
working-directory: ${{ env.CPYTHON_BUILDDIR }}
7878
run: >-
7979
../cpython-ro-srcdir/configure
8080
--config-cache
8181
--with-pydebug
82-
--with-openssl=$OPENSSL_DIR
82+
--with-openssl="$OPENSSL_DIR"
8383
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
8484
- name: Build CPython out-of-tree
8585
working-directory: ${{ env.CPYTHON_BUILDDIR }}
@@ -89,7 +89,7 @@ jobs:
8989
run: make pythoninfo
9090
- name: Remount sources writable for tests
9191
# some tests write to srcdir, lack of pyc files slows down testing
92-
run: sudo mount $CPYTHON_RO_SRCDIR -oremount,rw
92+
run: sudo mount "$CPYTHON_RO_SRCDIR" -oremount,rw
9393
- name: Tests
9494
working-directory: ${{ env.CPYTHON_BUILDDIR }}
9595
run: xvfb-run make test

‎.github/workflows/reusable-wasi.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,21 @@ jobs:
4848
save: ${{ github.event_name == 'push' }}
4949
max-size: "200M"
5050
- name: "Add ccache to PATH"
51-
run: echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
51+
run: echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
5252
- name: "Install Python"
5353
uses: actions/setup-python@v5
5454
with:
5555
python-version: '3.x'
56+
- name: "Runner image version"
57+
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
5658
- name: "Restore Python build config.cache"
5759
uses: actions/cache@v4
5860
with:
5961
path: ${{ env.CROSS_BUILD_PYTHON }}/config.cache
6062
# Include env.pythonLocation in key to avoid changes in environment when setup-python updates Python.
6163
# Include the hash of `Tools/wasm/wasi.py` as it may change the environment variables.
6264
# (Make sure to keep the key in sync with the other config.cache step below.)
63-
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ env.WASI_SDK_VERSION }}-${{ env.WASMTIME_VERSION }}-${{ inputs.config_hash }}-${{ hashFiles('Tools/wasm/wasi.py') }}-${{ env.pythonLocation }}
65+
key: ${{ github.job }}-${{ env.IMAGE_OS_VERSION }}-${{ env.WASI_SDK_VERSION }}-${{ env.WASMTIME_VERSION }}-${{ inputs.config_hash }}-${{ hashFiles('Tools/wasm/wasi.py') }}-${{ env.pythonLocation }}
6466
- name: "Configure build Python"
6567
run: python3 Tools/wasm/wasi.py configure-build-python -- --config-cache --with-pydebug
6668
- name: "Make build Python"
@@ -70,7 +72,7 @@ jobs:
7072
with:
7173
path: ${{ env.CROSS_BUILD_WASI }}/config.cache
7274
# Should be kept in sync with the other config.cache step above.
73-
key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ env.WASI_SDK_VERSION }}-${{ env.WASMTIME_VERSION }}-${{ inputs.config_hash }}-${{ hashFiles('Tools/wasm/wasi.py') }}-${{ env.pythonLocation }}
75+
key: ${{ github.job }}-${{ env.IMAGE_OS_VERSION }}-${{ env.WASI_SDK_VERSION }}-${{ env.WASMTIME_VERSION }}-${{ inputs.config_hash }}-${{ hashFiles('Tools/wasm/wasi.py') }}-${{ env.pythonLocation }}
7476
- name: "Configure host"
7577
# `--with-pydebug` inferred from configure-build-python
7678
run: python3 Tools/wasm/wasi.py configure-host -- --config-cache

0 commit comments

Comments
 (0)