Skip to content

Commit af4329e

Browse files
webknjazhugovkAA-Turner
authored
Integrate build_msi into main CI workflow (#121778)
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 e55b05f commit af4329e

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
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
@@ -571,6 +601,7 @@ jobs:
571601
- build_ubuntu_ssltests
572602
- build_wasi
573603
- build_windows
604+
- build_windows_msi
574605
- test_hypothesis
575606
- build_asan
576607
- build_tsan
@@ -585,6 +616,7 @@ jobs:
585616
with:
586617
allowed-failures: >-
587618
build_ubuntu_ssltests,
619+
build_windows_msi,
588620
cifuzz,
589621
test_hypothesis,
590622
allowed-skips: >-

.github/workflows/build_msi.yml

Lines changed: 0 additions & 40 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)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy