Skip to content

Commit c5d0972

Browse files
miss-islingtonzware
miss-islington
and
zware
authored
[3.13] Adjust build_ubuntu_ssltests job to use cache for the correct OS version (GH-124403) (#124481)
Adjust build_ubuntu_ssltests job to use cache for the correct OS version (GH-124403) (cherry picked from commit 54dd77f) Co-authored-by: Zachary Ware <zach@python.org>
1 parent 56467a6 commit c5d0972

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,13 +238,14 @@ jobs:
238238

239239
build_ubuntu_ssltests:
240240
name: 'Ubuntu SSL tests with OpenSSL'
241-
runs-on: ubuntu-22.04
241+
runs-on: ${{ matrix.os }}
242242
timeout-minutes: 60
243243
needs: check_source
244244
if: needs.check_source.outputs.run_tests == 'true'
245245
strategy:
246246
fail-fast: false
247247
matrix:
248+
os: [ubuntu-22.04]
248249
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
249250
env:
250251
OPENSSL_VER: ${{ matrix.openssl_ver }}
@@ -274,7 +275,7 @@ jobs:
274275
uses: actions/cache@v4
275276
with:
276277
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
277-
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
278+
key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
278279
- name: Install OpenSSL
279280
if: steps.cache-openssl.outputs.cache-hit != 'true'
280281
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux
@@ -452,7 +453,7 @@ jobs:
452453
uses: actions/cache@v4
453454
with:
454455
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
455-
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
456+
key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
456457
- name: Install OpenSSL
457458
if: steps.cache-openssl.outputs.cache-hit != 'true'
458459
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ jobs:
1414
build_ubuntu_reusable:
1515
name: 'build and test'
1616
timeout-minutes: 60
17-
runs-on: ubuntu-22.04
17+
runs-on: ${{ matrix.os }}
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
os: [ubuntu-22.04]
1822
env:
1923
FORCE_COLOR: 1
2024
OPENSSL_VER: 3.0.15
@@ -36,7 +40,7 @@ jobs:
3640
uses: actions/cache@v4
3741
with:
3842
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
39-
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
43+
key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
4044
- name: Install OpenSSL
4145
if: steps.cache-openssl.outputs.cache-hit != 'true'
4246
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux

0 commit comments

Comments
 (0)