Bump python interpreter to 3.12

Try a fix for Mac 3.12 with GHA Revert "Try a fix for Mac 3.12 with GHA" This reverts commit 7fdec3d. Use my forked actions that actually builds python on mac instead of downloading the universal mac pkg The macos-12 picked up a toolcache python 3.12.2 instead of the one I built Force remove python 3.12 from the GHA runner toolcache
jmarrec · May 28, 2024 · 0ee2aa7 · 0ee2aa7
1 parent 77d3641
commit 0ee2aa7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/linux_release.yml b/.github/workflows/linux_release.yml
@@ -8,7 +8,7 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   BUILD_TYPE: Release
-  Python_REQUIRED_VERSION: 3.8
+  Python_REQUIRED_VERSION: 3.12.2
 
 jobs:
   build_installer_artifact:
@@ -30,7 +30,7 @@ jobs:
 
     - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
       id: setup-python
-      uses: actions/setup-python@v4
+      uses: jmarrec/setup-python@v5
       with:
         python-version: ${{ env.Python_REQUIRED_VERSION }}
 

diff --git a/.github/workflows/mac_release.yml b/.github/workflows/mac_release.yml
@@ -10,6 +10,7 @@ env:
   BUILD_TYPE: Release
   FC: gfortran-13
   SDKROOT: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+  Python_REQUIRED_VERSION: 3.12.2
 
 jobs:
   build_installer_artifact:
@@ -19,35 +20,39 @@ jobs:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
-        macos_dev_target: [11.6, 12.1]  #, 13.0]
+        macos_dev_target: [11.6, 12.1, 13.0]
         include:
         - macos_dev_target: 11.6
           os: macos-11
           allow_failure: false
           arch: x86_64
-          python: 3.8
         - macos_dev_target: 12.1
           os: macos-12
           allow_failure: false
           arch: x86_64
-          python: 3.8
-#        - macos_dev_target: 13.0
-#          os: macos-14
-#          allow_failure: false
-#          arch: arm64
-#          python: 3.12.0  # Make sure to add the package testing below for ARM once we add this build to GHA
+        - macos_dev_target: 13.0
+          os: macos-14
+          allow_failure: false
+          arch: arm64
     permissions:
       # Needed permission to upload the release asset
       contents: write
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Python ${{ matrix.python }}
+    - name: Remove python ${{ env.Python_REQUIRED_VERSION }} from the toolcache
+      run: |
+        ls $RUNNER_TOOL_CACHE/Python || true
+        rm -Rf "$RUNNER_TOOL_CACHE/Python/${{ env.Python_REQUIRED_VERSION }}"
+        rm -Rf "$RUNNER_TOOL_CACHE/Python/${{ env.Python_REQUIRED_VERSION }}*/"
+
+    - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
       id: setup-python
-      uses: actions/setup-python@v4
+      uses: jmarrec/setup-python@v5
       with:
-        python-version: ${{ matrix.python }}
+        python-version: ${{ env.Python_REQUIRED_VERSION }}
+        # check-latest: true # Force pick up the python I built instead of the (potential) toolcache one. I could also do `rm -Rf $RUNNER_TOOL_CACHE/Python/3.12.2` before this action
 
     - name: Setup QtIFW 4.x
       uses: jmarrec/setup-qtifw@v1

diff --git a/.github/workflows/windows_release.yml b/.github/workflows/windows_release.yml
@@ -9,7 +9,7 @@ env:
   CMAKE_Fortran_COMPILER: "/c/msys64/mingw64/bin/x86_64-w64-mingw32-gfortran.exe"
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   BUILD_TYPE: Release
-  Python_REQUIRED_VERSION: 3.8
+  Python_REQUIRED_VERSION: 3.12.2
 
 jobs:
   build_installer_artifact:
@@ -52,7 +52,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
-      uses: actions/setup-python@v4
+      uses: jmarrec/setup-python@v5
       id: setup-python
       with:
         python-version: ${{ env.Python_REQUIRED_VERSION }}