Skip to content

Commit f8ddebb

Browse files
authored
[3.12] Integrate build_msi into main CI workflow (GH-121778) (#122231)
(cherry picked from commit af4329e)
1 parent 9dad694 commit f8ddebb

File tree

3 files changed

+56
-38
lines changed

3 files changed

+56
-38
lines changed

.github/workflows/build.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
# }}
5757
#
5858
run-docs: ${{ steps.docs-changes.outputs.run-docs || false }}
59+
run-win-msi: ${{ steps.win-msi-changes.outputs.run-win-msi || false }}
5960
run_tests: ${{ steps.check.outputs.run_tests || false }}
6061
run_hypothesis: ${{ steps.check.outputs.run_hypothesis || false }}
6162
config_hash: ${{ steps.config_hash.outputs.hash }} # str
@@ -115,6 +116,20 @@ jobs:
115116
id: docs-changes
116117
run: |
117118
echo "run-docs=true" >> "${GITHUB_OUTPUT}"
119+
- name: Get a list of the MSI installer-related files
120+
id: changed-win-msi-files
121+
uses: Ana06/[email protected]
122+
with:
123+
filter: |
124+
Tools/msi/**
125+
.github/workflows/reusable-windows-msi.yml
126+
format: csv # works for paths with spaces
127+
- name: Check for changes in MSI installer-related files
128+
if: >-
129+
steps.changed-win-msi-files.outputs.added_modified_renamed != ''
130+
id: win-msi-changes
131+
run: |
132+
echo "run-win-msi=true" >> "${GITHUB_OUTPUT}"
118133
119134
check-docs:
120135
name: Docs
@@ -255,6 +270,21 @@ jobs:
255270
arch: ${{ matrix.arch }}
256271
free-threading: ${{ matrix.free-threading }}
257272

273+
build_windows_msi:
274+
name: >- # ${{ '' } is a hack to nest jobs under the same sidebar category
275+
Windows MSI${{ '' }}
276+
needs: check_source
277+
if: fromJSON(needs.check_source.outputs.run-win-msi)
278+
strategy:
279+
matrix:
280+
arch:
281+
- x86
282+
- x64
283+
- arm64
284+
uses: ./.github/workflows/reusable-windows-msi.yml
285+
with:
286+
arch: ${{ matrix.arch }}
287+
258288
build_macos:
259289
name: 'macOS'
260290
needs: check_source
@@ -532,6 +562,7 @@ jobs:
532562
- build_ubuntu
533563
- build_ubuntu_ssltests
534564
- build_windows
565+
- build_windows_msi
535566
- test_hypothesis
536567
- build_asan
537568
- build_tsan
@@ -545,6 +576,7 @@ jobs:
545576
allowed-failures: >-
546577
build_macos,
547578
build_ubuntu_ssltests,
579+
build_windows_msi,
548580
test_hypothesis,
549581
allowed-skips: >-
550582
${{

.github/workflows/build_msi.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.
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)