Change to Mac Admins Open Source developer cert :)

macadmins · Feb 8, 2023 · 11bfc5b · 11bfc5b
1 parent b6125e5
commit 11bfc5b
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 32 deletions.
diff --git a/.github/workflows/build_nudge_pr.yml b/.github/workflows/build_nudge_pr.yml
@@ -20,16 +20,16 @@ jobs:
       uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12_MAOS }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS }}
 
     - name: Install Apple Installer certificates
       uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged
       with:
         create-keychain: false # do not create a new keychain for this value
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12_MAOS }}
+        p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD_MAOS }}
 
     - name: Run build package script
       run: ./build_nudge.zsh

diff --git a/.github/workflows/build_nudge_prerelease.yml b/.github/workflows/build_nudge_prerelease.yml
@@ -1,7 +1,7 @@
 name: Build signed Nudge and upload signed package (prerelease)
 
 env:
-  NOTARY_APP_PASSWORD: ${{ secrets.NOTARY_APP_PASSWORD }}
+  NOTARY_APP_PASSWORD: ${{ secrets.NOTARY_APP_PASSWORD_MAOS }}
 
 on:
   push:
@@ -27,16 +27,16 @@ jobs:
       uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12_MAOS }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS }}
 
     - name: Install Apple Installer certificates
       uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged
       with:
         create-keychain: false # do not create a new keychain for this value
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12_MAOS }}
+        p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD_MAOS }}
 
     - name: Run build package script
       run: ./build_nudge.zsh "CREATE_PKG" "$NOTARY_APP_PASSWORD"

diff --git a/.github/workflows/build_nudge_prerelease_manual.yml b/.github/workflows/build_nudge_prerelease_manual.yml
@@ -1,7 +1,7 @@
 name: Manual build signed Nudge and upload signed package (prerelease)
 
 env:
-  NOTARY_APP_PASSWORD: ${{ secrets.NOTARY_APP_PASSWORD }}
+  NOTARY_APP_PASSWORD: ${{ secrets.NOTARY_APP_PASSWORD_MAOS }}
 
 on: [workflow_dispatch]
 
@@ -19,16 +19,16 @@ jobs:
       uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12_MAOS }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS }}
 
     - name: Install Apple Installer certificates
       uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged
       with:
         create-keychain: false # do not create a new keychain for this value
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12_MAOS }}
+        p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD_MAOS }}
 
     - name: Run build package script
       run: ./build_nudge.zsh "CREATE_PKG" "$NOTARY_APP_PASSWORD"

diff --git a/.github/workflows/build_nudge_release.yml b/.github/workflows/build_nudge_release.yml
@@ -1,7 +1,7 @@
 name: Build signed Nudge and upload signed package
 
 env:
-  NOTARY_APP_PASSWORD: ${{ secrets.NOTARY_APP_PASSWORD }}
+  NOTARY_APP_PASSWORD: ${{ secrets.NOTARY_APP_PASSWORD_MAOS }}
 
 on:
   push:
@@ -27,16 +27,16 @@ jobs:
       uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12_MAOS }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS }}
 
     - name: Install Apple Installer certificates
       uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged
       with:
         create-keychain: false # do not create a new keychain for this value
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12_MAOS }}
+        p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD_MAOS }}
 
     - name: Run build package script
       run: ./build_nudge.zsh "CREATE_PKG" "$NOTARY_APP_PASSWORD"

diff --git a/.github/workflows/build_nudge_release_manual.yml b/.github/workflows/build_nudge_release_manual.yml
@@ -1,7 +1,7 @@
 name: Manual build signed Nudge and upload signed package
 
 env:
-  NOTARY_APP_PASSWORD: ${{ secrets.NOTARY_APP_PASSWORD }}
+  NOTARY_APP_PASSWORD: ${{ secrets.NOTARY_APP_PASSWORD_MAOS }}
 
 on: [workflow_dispatch]
 
@@ -19,16 +19,16 @@ jobs:
       uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12_MAOS }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD_MAOS }}
 
     - name: Install Apple Installer certificates
       uses: ssrobins/import-codesign-certs@04ce695a5e6002f1971a8ed78fedd676318f950f # Move back to apple-actions/import-codesign-certs when merged
       with:
         create-keychain: false # do not create a new keychain for this value
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.PKG_CERTIFICATES_P12_MAOS }}
+        p12-password: ${{ secrets.PKG_CERTIFICATES_P12_PASSWORD_MAOS }}
 
     - name: Run build package script
       run: ./build_nudge.zsh "CREATE_PKG" "$NOTARY_APP_PASSWORD"

diff --git a/Nudge.xcodeproj/project.pbxproj b/Nudge.xcodeproj/project.pbxproj
@@ -677,7 +677,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Nudge/Preview Content\"";
-				DEVELOPMENT_TEAM = 9GQZ7KUFR6;
+				DEVELOPMENT_TEAM = T4SK8ZXCXG;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = Nudge/Info.plist;
@@ -705,7 +705,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1.0.0;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 9GQZ7KUFR6;
+				DEVELOPMENT_TEAM = T4SK8ZXCXG;
 				INFOPLIST_FILE = NudgeTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -733,7 +733,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1.0.0;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 9GQZ7KUFR6;
+				DEVELOPMENT_TEAM = T4SK8ZXCXG;
 				INFOPLIST_FILE = NudgeTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -760,7 +760,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1.0.0;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 9GQZ7KUFR6;
+				DEVELOPMENT_TEAM = T4SK8ZXCXG;
 				INFOPLIST_FILE = NudgeUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -786,7 +786,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1.0.0;
 				DEAD_CODE_STRIPPING = YES;
-				DEVELOPMENT_TEAM = 9GQZ7KUFR6;
+				DEVELOPMENT_TEAM = T4SK8ZXCXG;
 				INFOPLIST_FILE = NudgeUITests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/build_nudge.zsh b/build_nudge.zsh
@@ -5,8 +5,8 @@
 # Variables
 XCODE_PATH="/Applications/Xcode_14.2.app"
 XCODE_ORIGINAL_PATH="/Applications/Xcode_14.2.app"
-CODE_SIGN_IDENTITY="Developer ID Application: Clever DevOps Co. (9GQZ7KUFR6)"
-SIGNING_IDENTITY="Developer ID Installer: Clever DevOps Co. (9GQZ7KUFR6)"
+CODE_SIGN_IDENTITY="Developer ID Application: Mac Admins Open Source (T4SK8ZXCXG)"
+SIGNING_IDENTITY="Developer ID Application: Mac Admins Open Source (T4SK8ZXCXG)"
 MP_SHA="71c57fcfdf43692adcd41fa7305be08f66bae3e5"
 MP_BINDIR="/tmp/munki-pkg"
 CONSOLEUSER=$(/usr/bin/stat -f "%Su" /dev/console)
@@ -59,7 +59,7 @@ if [ "${XCB_RESULT}" != "0" ]; then
 fi
 
 # Setup notary item
-$XCODE_NOTARY_PATH store-credentials --apple-id "[email protected]" --team-id "9GQZ7KUFR6" --password "$2" nudge
+$XCODE_NOTARY_PATH store-credentials --apple-id "[email protected]" --team-id "T4SK8ZXCXG" --password "$2" nudge
 
 # Zip application for notary
 /usr/bin/ditto -c -k --keepParent "${BUILDSDIR}/Release/Nudge.app" "${BUILDSDIR}/Release/Nudge.zip"