From 1e43817263b9ce439b93d6e89bee38f9fa20085f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sviatoslav=20Sydorenko=20=28=D0=A1=D0=B2=D1=8F=D1=82=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1=D0=B8=D0=B4=D0=BE=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BA=D0=BE=29?= <wk.cvs.github@sydorenko.org.ua>
Date: Wed, 24 Jul 2024 11:46:39 +0200
Subject: [PATCH] [3.12] Integrate `build_msi` into main CI workflow
 (GH-121778)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>.
(cherry picked from commit af4329e7b1a25d58bb92f79480f5059c3683517b)

Co-authored-by: Sviatoslav Sydorenko (Святослав Сидоренко) <wk.cvs.github@sydorenko.org.ua>
---
 .github/workflows/build.yml                | 32 ++++++++++++++++++
 .github/workflows/build_msi.yml            | 38 ----------------------
 .github/workflows/reusable-windows-msi.yml | 24 ++++++++++++++
 3 files changed, 56 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/build_msi.yml
 create mode 100644 .github/workflows/reusable-windows-msi.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 17fc270bcc5d03..d599a88cb86af1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,6 +56,7 @@ jobs:
       #   }}
       #
       run-docs: ${{ steps.docs-changes.outputs.run-docs || false }}
+      run-win-msi: ${{ steps.win-msi-changes.outputs.run-win-msi || false }}
       run_tests: ${{ steps.check.outputs.run_tests || false }}
       run_hypothesis: ${{ steps.check.outputs.run_hypothesis || false }}
       config_hash: ${{ steps.config_hash.outputs.hash }}  # str
@@ -115,6 +116,20 @@ jobs:
         id: docs-changes
         run: |
           echo "run-docs=true" >> "${GITHUB_OUTPUT}"
+      - name: Get a list of the MSI installer-related files
+        id: changed-win-msi-files
+        uses: Ana06/get-changed-files@v2.3.0
+        with:
+          filter: |
+            Tools/msi/**
+            .github/workflows/reusable-windows-msi.yml
+          format: csv  # works for paths with spaces
+      - name: Check for changes in MSI installer-related files
+        if: >-
+          steps.changed-win-msi-files.outputs.added_modified_renamed != ''
+        id: win-msi-changes
+        run: |
+          echo "run-win-msi=true" >> "${GITHUB_OUTPUT}"
 
   check-docs:
     name: Docs
@@ -255,6 +270,21 @@ jobs:
       arch: ${{ matrix.arch }}
       free-threading: ${{ matrix.free-threading }}
 
+  build_windows_msi:
+    name: >-  # ${{ '' } is a hack to nest jobs under the same sidebar category
+      Windows MSI${{ '' }}
+    needs: check_source
+    if: fromJSON(needs.check_source.outputs.run-win-msi)
+    strategy:
+      matrix:
+        arch:
+        - x86
+        - x64
+        - arm64
+    uses: ./.github/workflows/reusable-windows-msi.yml
+    with:
+      arch: ${{ matrix.arch }}
+
   build_macos:
     name: 'macOS'
     needs: check_source
@@ -532,6 +562,7 @@ jobs:
     - build_ubuntu
     - build_ubuntu_ssltests
     - build_windows
+    - build_windows_msi
     - test_hypothesis
     - build_asan
     - build_tsan
@@ -545,6 +576,7 @@ jobs:
         allowed-failures: >-
           build_macos,
           build_ubuntu_ssltests,
+          build_windows_msi,
           test_hypothesis,
         allowed-skips: >-
           ${{
diff --git a/.github/workflows/build_msi.yml b/.github/workflows/build_msi.yml
deleted file mode 100644
index 29282dffa37ec0..00000000000000
--- a/.github/workflows/build_msi.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: TestsMSI
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-    - 'main'
-    - '3.*'
-    paths:
-    - 'Tools/msi/**'
-    - '.github/workflows/build_msi.yml'
-  pull_request:
-    branches:
-    - 'main'
-    - '3.*'
-    paths:
-    - 'Tools/msi/**'
-    - '.github/workflows/build_msi.yml'
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows Installer
-    runs-on: windows-latest
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        type: [x86, x64, arm64]
-    steps:
-    - uses: actions/checkout@v4
-    - name: Build CPython installer
-      run: .\Tools\msi\build.bat --doc -${{ matrix.type }}
diff --git a/.github/workflows/reusable-windows-msi.yml b/.github/workflows/reusable-windows-msi.yml
new file mode 100644
index 00000000000000..fc34ab7c3eb1f2
--- /dev/null
+++ b/.github/workflows/reusable-windows-msi.yml
@@ -0,0 +1,24 @@
+name: TestsMSI
+
+on:
+  workflow_call:
+    inputs:
+      arch:
+        description: CPU architecture
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: installer for ${{ inputs.arch }}
+    runs-on: windows-latest
+    timeout-minutes: 60
+    env:
+      IncludeFreethreaded: true
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build CPython installer
+      run: .\Tools\msi\build.bat --doc -${{ inputs.arch }}