Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Adjust build_ubuntu_ssltests job to use cache for the correct OS version (GH-124403)

This commit is contained in:
Zachary Ware 2024-09-24 20:27:23 -05:00 committed by GitHub
parent 5c6e3b7150
commit 54dd77fb8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build.yml vendored
View File

@ -195,13 +195,14 @@ jobs:
build_ubuntu_ssltests: build_ubuntu_ssltests:
name: 'Ubuntu SSL tests with OpenSSL' name: 'Ubuntu SSL tests with OpenSSL'
runs-on: ubuntu-22.04 runs-on: ${{ matrix.os }}
timeout-minutes: 60 timeout-minutes: 60
needs: check_source needs: check_source
if: needs.check_source.outputs.run_tests == 'true' if: needs.check_source.outputs.run_tests == 'true'
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-22.04]
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2] openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
env: env:
OPENSSL_VER: ${{ matrix.openssl_ver }} OPENSSL_VER: ${{ matrix.openssl_ver }}
@ -231,7 +232,7 @@ jobs:
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: ./multissl/openssl/${{ env.OPENSSL_VER }} path: ./multissl/openssl/${{ env.OPENSSL_VER }}
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }} key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
- name: Install OpenSSL - name: Install OpenSSL
if: steps.cache-openssl.outputs.cache-hit != 'true' 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 run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux
@ -410,7 +411,7 @@ jobs:
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: ./multissl/openssl/${{ env.OPENSSL_VER }} path: ./multissl/openssl/${{ env.OPENSSL_VER }}
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }} key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
- name: Install OpenSSL - name: Install OpenSSL
if: steps.cache-openssl.outputs.cache-hit != 'true' 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 run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux

8
.github/workflows/reusable-ubuntu.yml vendored
View File

@ -14,7 +14,11 @@ jobs:
build_ubuntu_reusable: build_ubuntu_reusable:
name: 'build and test' name: 'build and test'
timeout-minutes: 60 timeout-minutes: 60
runs-on: ubuntu-22.04 runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
env: env:
FORCE_COLOR: 1 FORCE_COLOR: 1
OPENSSL_VER: 3.0.15 OPENSSL_VER: 3.0.15
@ -36,7 +40,7 @@ jobs:
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: ./multissl/openssl/${{ env.OPENSSL_VER }} path: ./multissl/openssl/${{ env.OPENSSL_VER }}
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }} key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
- name: Install OpenSSL - name: Install OpenSSL
if: steps.cache-openssl.outputs.cache-hit != 'true' 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 run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux