first attempt at the new application cert

macadmins · Aug 18, 2021 · 8796c57 · 8796c57
1 parent b161bd3
commit 8796c57
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/build_nudge_prerelease.yml b/.github/workflows/build_nudge_prerelease.yml
@@ -21,8 +21,8 @@ jobs:
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
 
     - name: Install Apple Installer certificates
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071

diff --git a/.github/workflows/build_nudge_prerelease_manual.yml b/.github/workflows/build_nudge_prerelease_manual.yml
@@ -14,8 +14,8 @@ jobs:
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
 
     - name: Install Apple Installer certificates
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071

diff --git a/.github/workflows/build_nudge_prerelease_pr.yml b/.github/workflows/build_nudge_prerelease_pr.yml
@@ -17,8 +17,8 @@ jobs:
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
 
     - name: Install Apple Installer certificates
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071

diff --git a/.github/workflows/build_nudge_release.yml b/.github/workflows/build_nudge_release.yml
@@ -21,8 +21,8 @@ jobs:
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
 
     - name: Install Apple Installer certificates
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071

diff --git a/.github/workflows/build_nudge_release_manual.yml b/.github/workflows/build_nudge_release_manual.yml
@@ -14,8 +14,8 @@ jobs:
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
 
     - name: Install Apple Installer certificates
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071

diff --git a/.github/workflows/build_nudge_release_pr.yml b/.github/workflows/build_nudge_release_pr.yml
@@ -17,8 +17,8 @@ jobs:
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071
       with:
         keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }}
-        p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
-        p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+        p12-file-base64: ${{ secrets.APP_CERTIFICATES_P12 }}
+        p12-password: ${{ secrets.APP_CERTIFICATES_P12_PASSWORD }}
 
     - name: Install Apple Installer certificates
       uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071

diff --git a/build_nudge.zsh b/build_nudge.zsh
@@ -3,6 +3,7 @@
 # Build script for Nudge
 
 # Variables
+CODE_SIGN_IDENTITY="Developer ID Application: Clever DevOps Co. (9GQZ7KUFR6)"
 SIGNING_IDENTITY="Developer ID Installer: Clever DevOps Co. (9GQZ7KUFR6)"
 MP_SHA="71c57fcfdf43692adcd41fa7305be08f66bae3e5"
 MP_BINDIR="/tmp/munki-pkg"
@@ -31,7 +32,7 @@ if [ -e $XCODE_BUILD_PATH ]; then
 else
   XCODE_BUILD="xcodebuild"
 fi
-$XCODE_BUILD -project "$TOOLSDIR/Nudge.xcodeproj" CODE_SIGN_IDENTITY="Apple Distribution: Clever DevOps Co. (9GQZ7KUFR6)"
+$XCODE_BUILD -project "$TOOLSDIR/Nudge.xcodeproj" CODE_SIGN_IDENTITY=$CODE_SIGN_IDENTITY
 XCB_RESULT="$?"
 if [ "${XCB_RESULT}" != "0" ]; then
     echo "Error running xcodebuild: ${XCB_RESULT}" 1>&2