From 25c1bf53d079d1fa52a5144b63bca3e66d8e21d4 Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Sun, 22 May 2022 14:32:04 +0200
Subject: [PATCH 1/4] action: use the most recent python from tool cache to run
 the GitHub Action

---
 .github/workflows/test.yml | 13 +++++++++++++
 action.yml                 |  7 +++++++
 2 files changed, 20 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a588b5268..af03e3f40 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,6 +66,19 @@ jobs:
         name: sample_wheels
         path: wheelhouse
 
+    - name: Get some sample wheels (GitHub Action)
+      uses: ./
+      with:
+        package-dir: sample_proj
+        output-dir: wheelhouse_action
+      env:
+        CIBW_ARCHS_MACOS: x86_64 universal2 arm64
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: sample_wheels_action
+        path: wheelhouse_action
+
     - name: Test cibuildwheel
       run: |
         python ./bin/run_tests.py
diff --git a/action.yml b/action.yml
index 703cb33a5..677883a23 100644
--- a/action.yml
+++ b/action.yml
@@ -20,10 +20,17 @@ branding:
 runs:
   using: composite
   steps:
+    # Set up a non-EOL, cibuildwheel & pipx supported Python version
+    - uses: actions/setup-python@766e8c60885ef280a3e447209d1f1083b3c7039d
+      id: python
+      with:
+        python-version: "3.7 - 3.10"
+        update-environment: false
 
     # Redirecting stderr to stdout to fix interleaving issue in Actions.
     - run: >
         pipx run
+        --python '${{ steps.python.outputs.python-path }}'
         --spec '${{ github.action_path }}'
         cibuildwheel
         ${{ inputs.package-dir }}

From f423b51ea6fda66e9fafdc776fac6f14a488bee6 Mon Sep 17 00:00:00 2001
From: Henry Schreiner <HenrySchreinerIII@gmail.com>
Date: Mon, 11 Jul 2022 09:34:04 -0500
Subject: [PATCH 2/4] Update action.yml

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 677883a23..a27269dd5 100644
--- a/action.yml
+++ b/action.yml
@@ -21,7 +21,7 @@ runs:
   using: composite
   steps:
     # Set up a non-EOL, cibuildwheel & pipx supported Python version
-    - uses: actions/setup-python@766e8c60885ef280a3e447209d1f1083b3c7039d
+    - uses: actions/setup-python@v4
       id: python
       with:
         python-version: "3.7 - 3.10"

From d76bbb60465fecde81deb65b7e2263e912470a24 Mon Sep 17 00:00:00 2001
From: Joe Rickerby <joerick@mac.com>
Date: Mon, 11 Jul 2022 18:29:09 +0200
Subject: [PATCH 3/4] Consolidate Github Actions sample builds

---
 .github/workflows/test.yml | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index af03e3f40..18ab5739e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -49,35 +49,22 @@ jobs:
       run: |
         python -m pip install ".[test]"
 
-    - name: Sample build
-      if: "contains(github.event.pull_request.labels.*.name, 'CI: Sample build')"
-      run: |
-        python bin/sample_build.py
-
-    - name: Get some sample wheels
+    - name: Generate a sample project
       run: |
         python -m test.test_projects test.test_0_basic.basic_project sample_proj
-        cibuildwheel --output-dir wheelhouse sample_proj
-      env:
-        CIBW_ARCHS_MACOS: x86_64 universal2 arm64
 
-    - uses: actions/upload-artifact@v3
-      with:
-        name: sample_wheels
-        path: wheelhouse
-
-    - name: Get some sample wheels (GitHub Action)
+    - name: Run a sample build (GitHub Action)
       uses: ./
       with:
         package-dir: sample_proj
-        output-dir: wheelhouse_action
+        output-dir: wheelhouse
       env:
         CIBW_ARCHS_MACOS: x86_64 universal2 arm64
 
     - uses: actions/upload-artifact@v3
       with:
         name: sample_wheels_action
-        path: wheelhouse_action
+        path: wheelhouse
 
     - name: Test cibuildwheel
       run: |

From de53d483733914936efffd0ebe658f4b96f18b28 Mon Sep 17 00:00:00 2001
From: Henry Schreiner <HenrySchreinerIII@gmail.com>
Date: Tue, 12 Jul 2022 08:46:45 -0500
Subject: [PATCH 4/4] ci: try ubuntu 18.04

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9bcf4187a..6861e96f9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-11]
+        os: [ubuntu-18.04, windows-latest, macos-11]
         python_version: ['3.10']
     timeout-minutes: 180
     steps: