diff --git a/.github/workflows/build_python_3.10.yml b/.github/workflows/build_python_3.10.yml index f03cb37..d44e691 100644 --- a/.github/workflows/build_python_3.10.yml +++ b/.github/workflows/build_python_3.10.yml @@ -38,7 +38,7 @@ jobs: p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD_MAOS }} - name: Run build package script - run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "${NOTARY_APP_PASSWORD}" + run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "$PYTHON_MAJOR_VERSION" "${NOTARY_APP_PASSWORD}" - name: get environment variables id: get_env_var diff --git a/.github/workflows/build_python_3.11.yml b/.github/workflows/build_python_3.11.yml index 0299d1a..9b9ec16 100644 --- a/.github/workflows/build_python_3.11.yml +++ b/.github/workflows/build_python_3.11.yml @@ -38,7 +38,7 @@ jobs: p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD_MAOS }} - name: Run build package script - run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "${NOTARY_APP_PASSWORD}" + run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "$PYTHON_MAJOR_VERSION" "${NOTARY_APP_PASSWORD}" - name: get environment variables id: get_env_var diff --git a/.github/workflows/build_python_3.12.yml b/.github/workflows/build_python_3.12.yml index f36ea2a..10b6532 100644 --- a/.github/workflows/build_python_3.12.yml +++ b/.github/workflows/build_python_3.12.yml @@ -38,7 +38,7 @@ jobs: p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD_MAOS }} - name: Run build package script - run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "${NOTARY_APP_PASSWORD}" + run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "$PYTHON_MAJOR_VERSION" "${NOTARY_APP_PASSWORD}" - name: get environment variables id: get_env_var diff --git a/.github/workflows/build_python_3.9.yml b/.github/workflows/build_python_3.9.yml index 8175131..17b394a 100644 --- a/.github/workflows/build_python_3.9.yml +++ b/.github/workflows/build_python_3.9.yml @@ -38,7 +38,7 @@ jobs: p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD_MAOS }} - name: Run build package script - run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "${NOTARY_APP_PASSWORD}" + run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "$PYTHON_MAJOR_VERSION" "${NOTARY_APP_PASSWORD}" - name: get environment variables id: get_env_var diff --git a/build_python_framework_pkgs.zsh b/build_python_framework_pkgs.zsh index e05ea8d..5a23622 100755 --- a/build_python_framework_pkgs.zsh +++ b/build_python_framework_pkgs.zsh @@ -288,7 +288,7 @@ SIGNED_JSONFILE echo "Could not sign package: ${PKG_RESULT}" 1>&2 exit 1 else - if [ -n "$5" ]; then + if [ -n "$6" ]; then # Notarize and staple the package $XCODE_NOTARY_PATH store-credentials --apple-id "opensource@macadmins.io" --team-id "T4SK8ZXCXG" --password "$NOTARY_APP_PASSWORD" macadminpython # If these fail, it will bail on the entire process