[3.12] Adjust build_ubuntu_ssltests job to use cache for the correct … · python/cpython@391c4fc · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 75k

• Code
• Issues 5k+
• Pull requests 2.6k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 391c4fc

Browse filesBrowse the repository at this point in the historyBrowse files

miss-islington

authored

[3.12] Adjust build_ubuntu_ssltests job to use cache for the correct OS version (GH-124482)

(cherry picked from commit 54dd77f) Authored-by: Zachary Ware <zach@python.org>

1 parent c60d978 commit 391c4fc
Copy full SHA for 391c4fc

2 files changed

+10-5Lines changed: 10 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .github/workflows
  • build.yml
  • reusable-ubuntu.yml

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.github/workflows/build.yml‎

Copy file name to clipboardExpand all lines: .github/workflows/build.yml

+4-3Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -248,13 +248,14 @@ jobs:
248	248
249	249	build_ubuntu_ssltests:
250	250	name: 'Ubuntu SSL tests with OpenSSL'
251		- runs-on: ubuntu-22.04
	251	+ runs-on: ${{ matrix.os }}
252	252	timeout-minutes: 60
253	253	needs: check_source
254	254	if: needs.check_source.outputs.run_tests == 'true'
255	255	strategy:
256	256	fail-fast: false
257	257	matrix:
	258	+ os: [ubuntu-22.04]
258	259	openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
259	260	env:
260	261	OPENSSL_VER: ${{ matrix.openssl_ver }}
@@ -284,7 +285,7 @@ jobs:
284	285	uses: actions/cache@v4
285	286	with:
286	287	path: ./multissl/openssl/${{ env.OPENSSL_VER }}
287		- key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
	288	+ key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
288	289	- name: Install OpenSSL
289	290	if: steps.cache-openssl.outputs.cache-hit != 'true'
290	291	run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux
@@ -454,7 +455,7 @@ jobs:
454	455	uses: actions/cache@v4
455	456	with:
456	457	path: ./multissl/openssl/${{ env.OPENSSL_VER }}
457		- key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
	458	+ key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
458	459	- name: Install OpenSSL
459	460	if: steps.cache-openssl.outputs.cache-hit != 'true'
460	461	run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux

Collapse file

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

Copy file name to clipboardExpand all lines: .github/workflows/reusable-ubuntu.yml

+6-2Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -14,7 +14,11 @@ jobs:
14	14	build_ubuntu_reusable:
15	15	name: 'build and test'
16	16	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]
18	22	env:
19	23	OPENSSL_VER: 3.0.15
20	24	PYTHONSTRICTEXTENSIONBUILD: 1
@@ -34,7 +38,7 @@ jobs:
34	38	uses: actions/cache@v4
35	39	with:
36	40	path: ./multissl/openssl/${{ env.OPENSSL_VER }}
37		- key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
	41	+ key: ${{ matrix.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
38	42	- name: Install OpenSSL
39	43	if: steps.cache-openssl.outputs.cache-hit != 'true'
40	44	run: python3 Tools/ssl/multissltests.py --steps=library --base-directory $MULTISSL_DIR --openssl $OPENSSL_VER --system Linux

0 commit comments

Comments

0 (0)