Skip to content

Commit 66dd179

Browse files
authored
[3.12] Remove MSI build from security-only branch (#148007)
1 parent 7f2d89a commit 66dd179

File tree

5 files changed

+0
-92
lines changed

5 files changed

+0
-92
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -215,22 +215,6 @@ jobs:
215215
arch: ${{ matrix.arch }}
216216
free-threading: ${{ matrix.free-threading }}
217217

218-
build-windows-msi:
219-
name: >- # ${{ '' } is a hack to nest jobs under the same sidebar category
220-
Windows MSI${{ '' }}
221-
needs: build-context
222-
if: fromJSON(needs.build-context.outputs.run-windows-msi)
223-
strategy:
224-
fail-fast: false
225-
matrix:
226-
arch:
227-
- x86
228-
- x64
229-
- arm64
230-
uses: ./.github/workflows/reusable-windows-msi.yml
231-
with:
232-
arch: ${{ matrix.arch }}
233-
234218
build-macos:
235219
name: >-
236220
macOS
@@ -539,7 +523,6 @@ jobs:
539523
- check-autoconf-regen
540524
- check-generated-files
541525
- build-windows
542-
- build-windows-msi
543526
- build-macos
544527
- build-ubuntu
545528
- build-ubuntu-ssltests
@@ -553,7 +536,6 @@ jobs:
553536
uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe
554537
with:
555538
allowed-failures: >-
556-
build-windows-msi,
557539
build-ubuntu-ssltests,
558540
test-hypothesis,
559541
allowed-skips: >-

.github/workflows/reusable-change-detection.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ on: # yamllint disable-line rule:truthy
3232
run_tests:
3333
description: Whether to run the regular tests
3434
value: ${{ jobs.compute-changes.outputs.run-tests || false }} # bool
35-
run-win-msi:
36-
description: Whether to run the MSI installer smoke tests
37-
value: >- # bool
38-
${{ jobs.compute-changes.outputs.run-win-msi || false }}
3935
run_hypothesis:
4036
description: Whether to run the Hypothesis tests
4137
value: >- # bool
@@ -56,7 +52,6 @@ jobs:
5652
run-docs: ${{ steps.docs-changes.outputs.run-docs }}
5753
run-hypothesis: ${{ steps.check.outputs.run-hypothesis }}
5854
run-tests: ${{ steps.check.outputs.run-tests }}
59-
run-win-msi: ${{ steps.win-msi-changes.outputs.run-win-msi }}
6055
steps:
6156
- run: >-
6257
echo '${{ github.event_name }}'
@@ -136,23 +131,3 @@ jobs:
136131
id: docs-changes
137132
run: |
138133
echo "run-docs=true" >> "${GITHUB_OUTPUT}"
139-
- name: Get a list of the MSI installer-related files
140-
if: github.event_name == 'pull_request'
141-
id: changed-win-msi-files
142-
uses: Ana06/get-changed-files@v2.3.0
143-
with:
144-
filter: |
145-
Tools/msi/**
146-
.github/workflows/reusable-windows-msi.yml
147-
format: csv # works for paths with spaces
148-
- name: Check for changes in MSI installer-related files
149-
# We only want to run this on PRs when related files are changed,
150-
# or when user triggers manual workflow run.
151-
if: >-
152-
(
153-
github.event_name == 'pull_request'
154-
&& steps.changed-win-msi-files.outputs.added_modified_renamed != ''
155-
) || github.event_name == 'workflow_dispatch'
156-
id: win-msi-changes
157-
run: |
158-
echo "run-win-msi=true" >> "${GITHUB_OUTPUT}"

.github/workflows/reusable-context.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ on: # yamllint disable-line rule:truthy
2929
run-windows-tests:
3030
description: Whether to run the Windows tests
3131
value: ${{ jobs.compute-changes.outputs.run-windows-tests }} # bool
32-
run-windows-msi:
33-
description: Whether to run the MSI installer smoke tests
34-
value: ${{ jobs.compute-changes.outputs.run-windows-msi }} # bool
3532
run-ci-fuzz:
3633
description: Whether to run the CIFuzz job
3734
value: ${{ jobs.compute-changes.outputs.run-ci-fuzz }} # bool
@@ -46,7 +43,6 @@ jobs:
4643
run-ci-fuzz: ${{ steps.changes.outputs.run-ci-fuzz }}
4744
run-docs: ${{ steps.changes.outputs.run-docs }}
4845
run-tests: ${{ steps.changes.outputs.run-tests }}
49-
run-windows-msi: ${{ steps.changes.outputs.run-windows-msi }}
5046
run-windows-tests: ${{ steps.changes.outputs.run-windows-tests }}
5147
steps:
5248
- name: Set up Python

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

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

Tools/build/compute-changes.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ class Outputs:
5151
run_ci_fuzz: bool = False
5252
run_docs: bool = False
5353
run_tests: bool = False
54-
run_windows_msi: bool = False
5554
run_windows_tests: bool = False
5655

5756

@@ -79,9 +78,6 @@ def compute_changes() -> None:
7978
if outputs.run_docs:
8079
print("Build documentation")
8180

82-
if outputs.run_windows_msi:
83-
print("Build Windows MSI")
84-
8581
print(outputs)
8682

8783
write_github_output(outputs)
@@ -116,7 +112,6 @@ def process_changed_files(changed_files: Set[Path]) -> Outputs:
116112
run_ci_fuzz = False
117113
run_docs = False
118114
run_windows_tests = False
119-
run_windows_msi = False
120115

121116
for file in changed_files:
122117
# Documentation files
@@ -128,8 +123,6 @@ def process_changed_files(changed_files: Set[Path]) -> Outputs:
128123
run_tests = run_ci_fuzz = True
129124
if file.name == "reusable-docs.yml":
130125
run_docs = True
131-
if file.name == "reusable-windows-msi.yml":
132-
run_windows_msi = True
133126

134127
if not (
135128
doc_file
@@ -155,16 +148,11 @@ def process_changed_files(changed_files: Set[Path]) -> Outputs:
155148
if doc_file:
156149
run_docs = True
157150

158-
# Check for changed MSI installer-related files
159-
if file.parts[:2] == ("Tools", "msi"):
160-
run_windows_msi = True
161-
162151
return Outputs(
163152
run_ci_fuzz=run_ci_fuzz,
164153
run_docs=run_docs,
165154
run_tests=run_tests,
166155
run_windows_tests=run_windows_tests,
167-
run_windows_msi=run_windows_msi,
168156
)
169157

170158

@@ -178,7 +166,6 @@ def process_target_branch(outputs: Outputs, git_branch: str) -> Outputs:
178166

179167
if os.environ.get("GITHUB_EVENT_NAME", "").lower() == "workflow_dispatch":
180168
outputs.run_docs = True
181-
outputs.run_windows_msi = True
182169

183170
return outputs
184171

@@ -195,7 +182,6 @@ def write_github_output(outputs: Outputs) -> None:
195182
f.write(f"run-docs={bool_lower(outputs.run_docs)}\n")
196183
f.write(f"run-tests={bool_lower(outputs.run_tests)}\n")
197184
f.write(f"run-windows-tests={bool_lower(outputs.run_windows_tests)}\n")
198-
f.write(f"run-windows-msi={bool_lower(outputs.run_windows_msi)}\n")
199185

200186

201187
def bool_lower(value: bool, /) -> str:

0 commit comments

Comments
 (0)