8000 [3.13] Integrate `build_msi` into main CI workflow (GH-121778) (#122226) · python/cpython@0952ea9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0952ea9

Browse files
miss-islingtonwebknjazhugovkAA-Turner
authored
[3.13] Integrate build_msi into main CI workflow (GH-121778) (#122226)
Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua> Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
1 parent a68237c commit 0952ea9

File tree

3 files changed

+56
-40
lines changed

3 files changed

+56
-40
lines changed

‎.github/workflows/build.yml

Lines changed: 32 additions & 0 deletions
< 8000 td data-grid-cell-id="diff-5c3fa597431eda03ac3339ae6bf7f05e1a50d6fc7333679ec38e21b337cb6721-570-600-0" data-selected="false" role="gridcell" style="background-color:var(--bgColor-default);text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative diff-line-number-neutral left-side">570
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
# }}
4949
#
5050
run-docs: ${{ steps.docs-changes.outputs.run-docs || false }}
51+
run-win-msi: ${{ steps.win-msi-changes.outputs.run-win-msi || false }}
5152
run_tests: ${{ steps.check.outputs.run_tests || false }}
5253
run_hypothesis: ${{ steps.check.outputs.run_hypothesis || false }}
5354
run_cifuzz: ${{ steps.check.outputs.run_cifuzz || false }}
@@ -123,6 +124,20 @@ jobs:
123124
id: docs-changes
124125
run: |
125126
echo "run-docs=true" >> "${GITHUB_OUTPUT}"
127+
- name: Get a list of the MSI installer-related files
128+
id: changed-win-msi-files
129+
uses: Ana06/get-changed-files@v2.3.0
130+
with:
131+
filter: |
132+
Tools/msi/**
133+
.github/workflows/reusable-windows-msi.yml
134+
format: csv # works for paths with spaces
135+
- name: Check for changes in MSI installer-related files
136+
if: >-
137+
steps.changed-win-msi-files.outputs.added_modified_renamed != ''
138+
id: win-msi-changes
139+
run: |
140+
echo "run-win-msi=true" >> "${GITHUB_OUTPUT}"
126141
127142
check-docs:
128143
name: Docs
@@ -218,6 +233,21 @@ jobs:
218233
arch: ${{ matrix.arch }}
219234
free-threading: ${{ matrix.free-threading }}
220235

236+
build_windows_msi:
237+
name: >- # ${{ '' } is a hack to nest jobs under the same sidebar category
238+
Windows MSI${{ '' }}
239+
needs: check_source
240+
if: fromJSON(needs.check_source.outputs.run-win-msi)
241+
strategy:
242+
matrix:
243+
arch:
244+
- x86
245+
- x64
246+
- arm64
247+
uses: ./.github/workflows/reusable-windows-msi.yml
248+
with:
249+
arch: ${{ matrix.arch }}
250+
221251
build_macos:
222252
name: 'macOS'
223253
needs: check_source
@@ -570,6 +600,7 @@ jobs:
600
- build_ubuntu_ssltests
571601
- build_wasi
572602
- build_windows
603+
- build_windows_msi
573604
- test_hypothesis
574605
- build_asan
575606
- build_tsan
@@ -584,6 +615,7 @@ jobs:
584615
with:
585616
allowed-failures: >-
586617
build_ubuntu_ssltests,
618+
build_windows_msi,
587619
cifuzz,
588620
test_hypothesis,
589621
allowed-skips: >-

‎.github/workflows/build_msi.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎.github/workflows/reusable-windows-msi.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: TestsMSI
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
arch:
7+
description: CPU architecture
8+
required: true
9+
type: string
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
build:
16+
name: installer for ${{ inputs.arch }}
17+
runs-on: windows-latest
18+
timeout-minutes: 60
19+
env:
20+
IncludeFreethreaded: true
21+
steps:
22+
- uses: actions/checkout@v4
23+
- name: Build CPython installer
24+
run: .\Tools\msi\build.bat --doc -${{ inputs.arch }}

0 commit comments

Comments
 (0)
0