Discharge7443/python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update gha and use new certs

Browse Source
This commit is contained in:
Erik Gomez
2023-03-21 10:41:24 -05:00
parent 3de6920d83
commit a0ae84c71d
5 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_python_3.10.yml
+13 -13
View File
@@ -2,8 +2,8 @@ name: Build Python 3.10
env: env:
TYPE: "recommended" TYPE: "recommended"
DEV_INSTALLER_ID: "Developer ID Installer: Clever DevOps Co. (9GQZ7KUFR6)" DEV_INSTALLER_ID: "Developer ID Installer: Mac Admins Open Source (T4SK8ZXCXG)"
DEV_APPLICATION_ID: "Developer ID Application: Clever DevOps Co. (9GQZ7KUFR6)" DEV_APPLICATION_ID: "Developer ID Application: Mac Admins Open Source (T4SK8ZXCXG)"
NOTARY_PASS: ${{ secrets.NOTARY_PASS }} NOTARY_PASS: ${{ secrets.NOTARY_PASS }}
PYTHON_VERSION: "3.10.9" PYTHON_VERSION: "3.10.9"
@@ -17,24 +17,24 @@ jobs:
steps: steps:
- name: Checkout python repo - name: Checkout python repo
uses: actions/checkout@v2 uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Install Apple Developer ID Application certificates - name: Install Apple Developer ID Application certificates
uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93 # v2.0.0
with: with:
keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }} keychain-password: ${{ github.run_id }}
p12-file-base64: ${{ secrets.DEV_APP_CERTIFICATES_P12 }} p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS }}
p12-password: ${{ secrets.DEV_APP_CERTIFICATES_P12_PASSWORD }} p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS_PASSWORD }}
- name: Install Apple Developer ID Installer certificates - name: Install Apple Developer ID Installer certificates
uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93 # v2.0.0
with: with:
create-keychain: false # do not create a new keychain for this value create-keychain: false # do not create a new keychain for this value
keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }} keychain-password: ${{ github.run_id }}
p12-file-base64: ${{ secrets.CERTIFICATES_P12 }} p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12_MAOS }}
p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }} p12-password: ${{ secrets.PKG_CERTIFICATES_P12_MAOS_PASSWORD }}
- name: Run build package script - name: Run build package script
run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "${NOTARY_PASS}" run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "${NOTARY_PASS}"
@@ -46,7 +46,7 @@ jobs:
- name: Generate changelog - name: Generate changelog
id: changelog id: changelog
uses: metcalfc/changelog-generator@31b6d6f9e6e17e84ad34bee780f82d8ee79f6842 # v4.0.1 uses: metcalfc/changelog-generator@afdcb9470aebdb2252c0c95a1c130723c9e21f3a # v4.1
with: with:
myToken: ${{ secrets.GITHUB_TOKEN }} myToken: ${{ secrets.GITHUB_TOKEN }}
reverse: 'true' reverse: 'true'
@@ -83,7 +83,7 @@ jobs:
files: ${{github.workspace}}/outputs/*.pkg files: ${{github.workspace}}/outputs/*.pkg
- name: Upload packages - name: Upload packages
uses: actions/upload-artifact@v3.1.1 uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
with: with:
name: packages name: packages
path: outputs/ path: outputs/
.github/workflows/build_python_3.11.yml
+13 -13
View File
@@ -2,8 +2,8 @@ name: Build Python 3.11
env: env:
TYPE: "recommended" TYPE: "recommended"
DEV_INSTALLER_ID: "Developer ID Installer: Clever DevOps Co. (9GQZ7KUFR6)" DEV_INSTALLER_ID: "Developer ID Installer: Mac Admins Open Source (T4SK8ZXCXG)"
DEV_APPLICATION_ID: "Developer ID Application: Clever DevOps Co. (9GQZ7KUFR6)" DEV_APPLICATION_ID: "Developer ID Application: Mac Admins Open Source (T4SK8ZXCXG)"
NOTARY_PASS: ${{ secrets.NOTARY_PASS }} NOTARY_PASS: ${{ secrets.NOTARY_PASS }}
PYTHON_VERSION: "3.11.1" PYTHON_VERSION: "3.11.1"
@@ -17,24 +17,24 @@ jobs:
steps: steps:
- name: Checkout python repo - name: Checkout python repo
uses: actions/checkout@v2 uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Install Apple Developer ID Application certificates - name: Install Apple Developer ID Application certificates
uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93 # v2.0.0
with: with:
keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }} keychain-password: ${{ github.run_id }}
p12-file-base64: ${{ secrets.DEV_APP_CERTIFICATES_P12 }} p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS }}
p12-password: ${{ secrets.DEV_APP_CERTIFICATES_P12_PASSWORD }} p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS_PASSWORD }}
- name: Install Apple Developer ID Installer certificates - name: Install Apple Developer ID Installer certificates
uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93 # v2.0.0
with: with:
create-keychain: false # do not create a new keychain for this value create-keychain: false # do not create a new keychain for this value
keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }} keychain-password: ${{ github.run_id }}
p12-file-base64: ${{ secrets.CERTIFICATES_P12 }} p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12_MAOS }}
p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }} p12-password: ${{ secrets.PKG_CERTIFICATES_P12_MAOS_PASSWORD }}
- name: Run build package script - name: Run build package script
run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "${NOTARY_PASS}" run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "${NOTARY_PASS}"
@@ -46,7 +46,7 @@ jobs:
- name: Generate changelog - name: Generate changelog
id: changelog id: changelog
uses: metcalfc/changelog-generator@31b6d6f9e6e17e84ad34bee780f82d8ee79f6842 # v4.0.1 uses: metcalfc/changelog-generator@afdcb9470aebdb2252c0c95a1c130723c9e21f3a # v4.1
with: with:
myToken: ${{ secrets.GITHUB_TOKEN }} myToken: ${{ secrets.GITHUB_TOKEN }}
reverse: 'true' reverse: 'true'
@@ -83,7 +83,7 @@ jobs:
files: ${{github.workspace}}/outputs/*.pkg files: ${{github.workspace}}/outputs/*.pkg
- name: Upload packages - name: Upload packages
uses: actions/upload-artifact@v3.1.1 uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
with: with:
name: packages name: packages
path: outputs/ path: outputs/
.github/workflows/build_python_3.9.yml
+13 -13
View File
@@ -2,8 +2,8 @@ name: Build Python 3.9
env: env:
TYPE: "recommended" TYPE: "recommended"
DEV_INSTALLER_ID: "Developer ID Installer: Clever DevOps Co. (9GQZ7KUFR6)" DEV_INSTALLER_ID: "Developer ID Installer: Mac Admins Open Source (T4SK8ZXCXG)"
DEV_APPLICATION_ID: "Developer ID Application: Clever DevOps Co. (9GQZ7KUFR6)" DEV_APPLICATION_ID: "Developer ID Application: Mac Admins Open Source (T4SK8ZXCXG)"
NOTARY_PASS: ${{ secrets.NOTARY_PASS }} NOTARY_PASS: ${{ secrets.NOTARY_PASS }}
PYTHON_VERSION: "3.9.13" PYTHON_VERSION: "3.9.13"
@@ -17,24 +17,24 @@ jobs:
steps: steps:
- name: Checkout python repo - name: Checkout python repo
uses: actions/checkout@v2 uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Install Apple Developer ID Application certificates - name: Install Apple Developer ID Application certificates
uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93 # v2.0.0
with: with:
keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }} keychain-password: ${{ github.run_id }}
p12-file-base64: ${{ secrets.DEV_APP_CERTIFICATES_P12 }} p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS }}
p12-password: ${{ secrets.DEV_APP_CERTIFICATES_P12_PASSWORD }} p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS_PASSWORD }}
- name: Install Apple Developer ID Installer certificates - name: Install Apple Developer ID Installer certificates
uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93 # v2.0.0
with: with:
create-keychain: false # do not create a new keychain for this value create-keychain: false # do not create a new keychain for this value
keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }} keychain-password: ${{ github.run_id }}
p12-file-base64: ${{ secrets.CERTIFICATES_P12 }} p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12_MAOS }}
p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }} p12-password: ${{ secrets.PKG_CERTIFICATES_P12_MAOS_PASSWORD }}
- name: Run build package script - name: Run build package script
run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "${NOTARY_PASS}" run: ./build_python_framework_pkgs.zsh "$TYPE" "$DEV_INSTALLER_ID" "$DEV_APPLICATION_ID" "$PYTHON_VERSION" "${NOTARY_PASS}"
@@ -46,7 +46,7 @@ jobs:
- name: Generate changelog - name: Generate changelog
id: changelog id: changelog
uses: metcalfc/changelog-generator@31b6d6f9e6e17e84ad34bee780f82d8ee79f6842 # v4.0.1 uses: metcalfc/changelog-generator@afdcb9470aebdb2252c0c95a1c130723c9e21f3a # v4.1
with: with:
myToken: ${{ secrets.GITHUB_TOKEN }} myToken: ${{ secrets.GITHUB_TOKEN }}
reverse: 'true' reverse: 'true'
@@ -88,7 +88,7 @@ jobs:
files: ${{github.workspace}}/outputs/*.pkg files: ${{github.workspace}}/outputs/*.pkg
- name: Upload packages - name: Upload packages
uses: actions/upload-artifact@v3.1.1 uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
with: with:
name: packages name: packages
path: outputs/ path: outputs/
build_all_python_frameworks.zsh
+1 -1
View File
@@ -6,7 +6,7 @@
# Run this with your current directory being the path where this script is located # Run this with your current directory being the path where this script is located
TOOLSDIR=$(dirname $0) TOOLSDIR=$(dirname $0)
SIGNING_IDENTITY="Developer ID Installer: Clever DevOps Co. (9GQZ7KUFR6)" SIGNING_IDENTITY="Developer ID Installer: Mac Admins Open Source (T4SK8ZXCXG)"
"$TOOLSDIR/build_python_framework_pkgs.zsh" minimal ${SIGNING_IDENTITY} "$TOOLSDIR/build_python_framework_pkgs.zsh" minimal ${SIGNING_IDENTITY}
"$TOOLSDIR/build_python_framework_pkgs.zsh" no_customization ${SIGNING_IDENTITY} "$TOOLSDIR/build_python_framework_pkgs.zsh" no_customization ${SIGNING_IDENTITY}
build_python_framework_pkgs.zsh
+2 -2
View File
@@ -245,7 +245,7 @@ if [ -n "$2" ]; then
{ {
"ownership": "recommended", "ownership": "recommended",
"suppress_bundle_relocation": true, "suppress_bundle_relocation": true,
"identifier": "org.macadmins.python.$TYPE", "identifier": "io.macadmins.python.$TYPE",
"postinstall_action": "none", "postinstall_action": "none",
"distribution_style": true, "distribution_style": true,
"version": "$AUTOMATED_PYTHON_BUILD", "version": "$AUTOMATED_PYTHON_BUILD",
@@ -266,7 +266,7 @@ SIGNED_JSONFILE
else else
if [ -n "$5" ]; then if [ -n "$5" ]; then
# Notarize and staple the package # Notarize and staple the package
$XCODE_NOTARY_PATH store-credentials --apple-id "macadmins@cleverdevops.com" --team-id "9GQZ7KUFR6" --password "$NOTARY_PASS" macadminpython $XCODE_NOTARY_PATH store-credentials --apple-id "opensource@macadmins.io" --team-id "T4SK8ZXCXG" --password "$NOTARY_PASS" macadminpython
# If these fail, it will bail on the entire process # If these fail, it will bail on the entire process
$XCODE_NOTARY_PATH submit "$TOOLSDIR/$TYPE/build/python_${TYPE}_signed-$AUTOMATED_PYTHON_BUILD.pkg" --keychain-profile "macadminpython" --wait $XCODE_NOTARY_PATH submit "$TOOLSDIR/$TYPE/build/python_${TYPE}_signed-$AUTOMATED_PYTHON_BUILD.pkg" --keychain-profile "macadminpython" --wait
$XCODE_STAPLER_PATH staple "$TOOLSDIR/$TYPE/build/python_${TYPE}_signed-$AUTOMATED_PYTHON_BUILD.pkg" $XCODE_STAPLER_PATH staple "$TOOLSDIR/$TYPE/build/python_${TYPE}_signed-$AUTOMATED_PYTHON_BUILD.pkg"