add major version env_var

macadmins · Feb 1, 2024 · 4139760 · 4139760
1 parent 942ef72
commit 4139760
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/.github/workflows/build_python_3.10.yml b/.github/workflows/build_python_3.10.yml
@@ -6,6 +6,7 @@ env:
   DEV_APPLICATION_ID: "Developer ID Application: Mac Admins Open Source (T4SK8ZXCXG)"
   NOTARY_PASS: ${{ secrets.NOTARY_PASS }}
   PYTHON_VERSION: "3.10.11"
+  PYTHON_MAJOR_VERSION: "3.10"
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/build_python_3.11.yml b/.github/workflows/build_python_3.11.yml
@@ -6,6 +6,7 @@ env:
   DEV_APPLICATION_ID: "Developer ID Application: Mac Admins Open Source (T4SK8ZXCXG)"
   NOTARY_PASS: ${{ secrets.NOTARY_PASS }}
   PYTHON_VERSION: "3.11.7"
+  PYTHON_MAJOR_VERSION: "3.11"
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/build_python_3.12.yml b/.github/workflows/build_python_3.12.yml
@@ -6,6 +6,7 @@ env:
   DEV_APPLICATION_ID: "Developer ID Application: Mac Admins Open Source (T4SK8ZXCXG)"
   NOTARY_PASS: ${{ secrets.NOTARY_PASS }}
   PYTHON_VERSION: "3.12.1"
+  PYTHON_MAJOR_VERSION: "3.12"
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/build_python_3.9.yml b/.github/workflows/build_python_3.9.yml
@@ -6,6 +6,7 @@ env:
   DEV_APPLICATION_ID: "Developer ID Application: Mac Admins Open Source (T4SK8ZXCXG)"
   NOTARY_PASS: ${{ secrets.NOTARY_PASS }}
   PYTHON_VERSION: "3.9.13"
+  PYTHON_MAJOR_VERSION: "3.9"
 
 on:
   workflow_dispatch:

diff --git a/build_python_framework_pkgs.zsh b/build_python_framework_pkgs.zsh
@@ -18,7 +18,7 @@ RP_BINDIR="/tmp/relocatable-python"
 MP_BINDIR="/tmp/munki-pkg"
 CONSOLEUSER=$(/usr/bin/stat -f "%Su" /dev/console)
 PIPCACHEDIR="/Users/${CONSOLEUSER}/Library/Caches/pip"
-XCODE_PATH="/Applications/Xcode_14.1.app"
+XCODE_PATH="/Applications/Xcode_15.2.app"
 XCODE_NOTARY_PATH="$XCODE_PATH/Contents/Developer/usr/bin/notarytool"
 XCODE_STAPLER_PATH="$XCODE_PATH/Contents/Developer/usr/bin/stapler"
 NEWSUBBUILD=$((80620 + $(/usr/bin/git rev-parse HEAD~0 | xargs -I{} /usr/bin/git rev-list --count {})))
@@ -56,6 +56,13 @@ if [ -n "$4" ]; then
   PYTHON_VERSION=$4
 else
   PYTHON_VERSION=3.11.1
+  PYTHON_VERSION=3.12.1
+fi
+
+if [ -n "$5" ]; then
+  PYTHON_MAJOR_VERSION=$5
+else
+  PYTHON_MAJOR_VERSION=3.12
 fi
 # Set python bin version based on PYTHON_VERSION
 PYTHON_BIN_VERSION="${PYTHON_VERSION%.*}"