diff options
| author | Nice Zombies <nineteendo19d0@gmail.com> | 2024-04-23 07:46:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-23 07:46:28 (GMT) |
| commit | 456c29cf85847c67dfc0fa36d6fe6168569b46fe (patch) | |
| tree | 066c92cc17514541f458daea21ef92ff70946b00 /.github | |
| parent | 8e86579caef59fad0c54ac698d589f23a7951c55 (diff) | |
| download | cpython-456c29cf85847c67dfc0fa36d6fe6168569b46fe.zip cpython-456c29cf85847c67dfc0fa36d6fe6168569b46fe.tar.gz cpython-456c29cf85847c67dfc0fa36d6fe6168569b46fe.tar.bz2 | |
gh-118039: Fix config.cache key on WASI (#118137)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/reusable-wasi.yml | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1a2a62..299c02e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -137,6 +137,7 @@ jobs: uses: actions/cache@v4 with: path: config.cache + # Include env.pythonLocation in key to avoid changes in environment when setup-python updates Python 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 diff --git a/.github/workflows/reusable-wasi.yml b/.github/workflows/reusable-wasi.yml index 60eef7b..4a509a8 100644 --- a/.github/workflows/reusable-wasi.yml +++ b/.github/workflows/reusable-wasi.yml @@ -50,7 +50,8 @@ jobs: uses: actions/cache@v4 with: path: ${{ env.CROSS_BUILD_PYTHON }}/config.cache - key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }} + # Include env.pythonLocation in key to avoid changes in environment when setup-python updates Python + key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}-${{ env.pythonLocation }} - name: "Configure build Python" run: python3 Tools/wasm/wasi.py configure-build-python -- --config-cache --with-pydebug - name: "Make build Python" @@ -59,7 +60,8 @@ jobs: uses: actions/cache@v4 with: path: ${{ env.CROSS_BUILD_WASI }}/config.cache - key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-wasi-sdk-${{ env.WASI_SDK_VERSION }}-${{ inputs.config_hash }} + # Include env.pythonLocation in key to avoid changes in environment when setup-python updates Python + key: ${{ github.job }}-${{ runner.os }}-${{ env.IMAGE_VERSION }}-wasi-sdk-${{ env.WASI_SDK_VERSION }}-${{ inputs.config_hash }}-${{ env.pythonLocation }} - name: "Configure host" # `--with-pydebug` inferred from configure-build-python run: python3 Tools/wasm/wasi.py configure-host -- --config-cache |