From 3ec6c98bc8302e9afef64b95c407040771170ea7 Mon Sep 17 00:00:00 2001
From: nikolai-frolov <nikolay.frolov@akvelon.com>
Date: Wed, 16 Feb 2022 20:42:04 +0300
Subject: [PATCH 1/3] Add ability to choose platform to build Python

---
 .github/workflows/python-builder.yml | 69 +++++++++++++++-------------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/python-builder.yml b/.github/workflows/python-builder.yml
index 028324b..d58cb58 100644
--- a/.github/workflows/python-builder.yml
+++ b/.github/workflows/python-builder.yml
@@ -11,6 +11,10 @@ on:
         description: 'Whether to publish releases'
         required: true
         default: 'false'
+      PLATFORMS:
+        description: 'Platforms for execution in "os" or "os_arch" format (arch is "x64" by default)'
+        required: true
+        default: 'ubuntu-18.04,ubuntu-20.04,macos-10.15,windows-2019_x64,windows-2019_x86'
   pull_request:
     paths-ignore:
     - 'versions-manifest.json'
@@ -26,26 +30,40 @@ defaults:
     shell: pwsh
 
 jobs:
+  generate_matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.generate-matrix.outputs.matrix }}
+    steps:
+      - name: Generate execution matrix
+        id: generate-matrix
+        run: |
+          $configurations = "${{ github.event.inputs.platforms }}".Split(",").Trim()
+          $matrix = @()
+
+          foreach ($configuration in $configurations) {
+            $parts = $configuration.Split("_")
+            $os = $parts[0]
+            $arch = $(if ($parts[1]) {$parts[1]} else {"x64"})
+            switch -wildcard ($os) {
+              "*ubuntu*" { $platform = $os.Replace("ubuntu","linux")}
+              "*macos*" { $platform = 'darwin' }
+              "*windows*" { $platform = 'win32' }
+            }
+            $matrix += @{
+              'platform' = $platform
+              'os' = $os
+              'arch' = $arch
+            }
+          }
+          echo "::set-output name=matrix::$($matrix | ConvertTo-Json -Compress)"
+
   build_python:
+    needs: generate_matrix
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - platform: 'linux-18.04'
-            os: 'ubuntu-18.04'
-            arch: 'x64'
-          - platform: 'linux-20.04'
-            os: 'ubuntu-20.04'
-            arch: 'x64'
-          - platform: 'darwin'
-            os: 'macos-10.15'
-            arch: 'x64'
-          - platform: 'win32'
-            os: 'windows-2019'
-            arch: 'x64'
-          - platform: 'win32'
-            os: 'windows-2019'
-            arch: 'x86'
+        include: ${{ fromJson(needs.generate_matrix.outputs.matrix) }}
     runs-on: ${{ matrix.os }}
     env:
       ARTIFACT_NAME: python-${{ github.event.inputs.VERSION || '3.9.9' }}-${{ matrix.platform }}-${{ matrix.arch }}
@@ -68,26 +86,11 @@ jobs:
           path: ${{ runner.temp }}/artifact
 
   test_python:
-    needs: build_python
+    needs: [generate_matrix, build_python]
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - platform: 'linux-18.04'
-            os: 'ubuntu-18.04'
-            arch: 'x64'
-          - platform: 'linux-20.04'
-            os: 'ubuntu-20.04'
-            arch: 'x64'
-          - platform: 'darwin'
-            os: 'macos-10.15'
-            arch: 'x64'
-          - platform: 'win32'
-            os: 'windows-2019'
-            arch: 'x64'
-          - platform: 'win32'
-            os: 'windows-2019'
-            arch: 'x86'
+        include: ${{ fromJson(needs.generate_matrix.outputs.matrix) }}
     runs-on: ${{ matrix.os }}
     env:
       ARTIFACT_NAME: python-${{ github.event.inputs.VERSION || '3.9.9' }}-${{ matrix.platform }}-${{ matrix.arch }}

From 588fb9d893f1c3848bc95dd687c12dea5cfe1bd8 Mon Sep 17 00:00:00 2001
From: nikolai-frolov <nikolay.frolov@akvelon.com>
Date: Thu, 17 Feb 2022 11:55:26 +0300
Subject: [PATCH 2/3] Update generate_matrix job to allow execution via PR

---
 .github/workflows/python-builder.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-builder.yml b/.github/workflows/python-builder.yml
index d58cb58..5579998 100644
--- a/.github/workflows/python-builder.yml
+++ b/.github/workflows/python-builder.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Generate execution matrix
         id: generate-matrix
         run: |
-          $configurations = "${{ github.event.inputs.platforms }}".Split(",").Trim()
+          $configurations = "${{ github.event.inputs.platforms || 'ubuntu-18.04,ubuntu-20.04,macos-10.15,windows-2019_x64,windows-2019_x86' }}".Split(",").Trim()
           $matrix = @()
 
           foreach ($configuration in $configurations) {

From 044e2816fbdd087d0dd2db20e5f7e8745a5b266a Mon Sep 17 00:00:00 2001
From: nikolai-frolov <nikolay.frolov@akvelon.com>
Date: Fri, 18 Feb 2022 13:18:51 +0300
Subject: [PATCH 3/3] Minor corrections according to comments

---
 .github/workflows/python-builder.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/python-builder.yml b/.github/workflows/python-builder.yml
index 5579998..5277dbb 100644
--- a/.github/workflows/python-builder.yml
+++ b/.github/workflows/python-builder.yml
@@ -44,7 +44,7 @@ jobs:
           foreach ($configuration in $configurations) {
             $parts = $configuration.Split("_")
             $os = $parts[0]
-            $arch = $(if ($parts[1]) {$parts[1]} else {"x64"})
+            $arch = if ($parts[1]) {$parts[1]} else {"x64"}
             switch -wildcard ($os) {
               "*ubuntu*" { $platform = $os.Replace("ubuntu","linux")}
               "*macos*" { $platform = 'darwin' }