retry

Author: ethanndickson

.github/workflows/release.yml

@@ -17,7 +17,6 @@ jobs:
       APP_PROF_PATH:   /tmp/app.provisionprofile
       EXT_PROF_PATH:   /tmp/ext.provisionprofile
       KEYCHAIN_PATH:   /tmp/app-signing.keychain-db
-      RELEASE_BUILD:   true
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
@@ -58,7 +57,6 @@ jobs:
 
       - name: Build
         run: |
-          make
           ./scripts/build.sh
 
       - name: Clean Up

Coder Desktop/project.yml

@@ -135,8 +135,8 @@ targets:
         INFOPLIST_KEY_NSHumanReadableCopyright: ""
         SWIFT_EMIT_LOC_STRINGS: YES
         PRODUCT_BUNDLE_IDENTIFIER: "com.coder.Coder-Desktop"
-        # Populated from environment variables at `xcodebuild` time
-        PROVISIONING_PROFILE_SPECIFIER: $CODER_APP_PROFILE
+        # Populated from environment variable during `xcodegen`
+        PROVISIONING_PROFILE_SPECIFIER: ${APP_PROVISIONING_PROFILE_ID}
 
         # (ThomasK33): Install the application into the /Applications folder
         # so that macOS stops complaining about the app being run from an
@@ -148,7 +148,7 @@ targets:
     dependencies:
       - target: CoderSDK
         embed: true
-      - target: VPNLib
+      - target: VPNXPC
         embed: true
       - target: VPN
         embed: without-signing # Embed without signing.
@@ -218,13 +218,16 @@ targets:
         PRODUCT_NAME: "$(PRODUCT_BUNDLE_IDENTIFIER)"
         SWIFT_EMIT_LOC_STRINGS: YES
         SWIFT_OBJC_BRIDGING_HEADER: "VPN/com_coder_Coder_Desktop_VPN-Bridging-Header.h"
-        # Populated from environment variables at `xcodebuild` time
-        PROVISIONING_PROFILE_SPECIFIER: $CODER_EXT_PROFILE
+        CODE_SIGN_IDENTITY: "Apple Development"
+        CODE_SIGN_STYLE: Automatic
+        PROVISIONING_PROFILE_SPECIFIER: ${EXT_PROVISIONING_PROFILE_ID}
     dependencies:
       - target: VPNLib
         embed: true
       - target: CoderSDK
         embed: true
+      - target: VPNXPC
+        embed: true
       - sdk: NetworkExtension.framework
 
   VPNLib:
@@ -240,8 +243,6 @@ targets:
         DYLIB_COMPATIBILITY_VERSION: 1
         DYLIB_CURRENT_VERSION: 1
         DYLIB_INSTALL_NAME_BASE: "@rpath"
-        CODE_SIGN_IDENTITY: "Apple Development"
-        CODE_SIGN_STYLE: Automatic
         LD_RUNPATH_SEARCH_PATHS:
           - "@executable_path/../Frameworks"
           - "@loader_path/Frameworks"
@@ -284,8 +285,6 @@ targets:
         DYLIB_COMPATIBILITY_VERSION: 1
         DYLIB_CURRENT_VERSION: 1
         DYLIB_INSTALL_NAME_BASE: "@rpath"
-        CODE_SIGN_IDENTITY: "Apple Development"
-        CODE_SIGN_STYLE: Automatic
     scheme:
       testTargets:
         - CoderSDKTests

Makefile

@@ -13,6 +13,8 @@ SWIFT_VERSION := 6.0
 
 ifdef RELEASE_BUILD
 PTP_SUFFIX := -systemextension
+APP_PROVISIONING_PROFILE_ID := ${APP_PROVISIONING_PROFILE_ID}
+EXT_PROVISIONING_PROFILE_ID := ${EXT_PROVISIONING_PROFILE_ID}
 else
 PTP_SUFFIX := ""
 endif
@@ -26,6 +28,9 @@ $(XCPROJECT): $(PROJECT)/project.yml
 	cd $(PROJECT); \
 		SWIFT_VERSION=$(SWIFT_VERSION) \
 		PTP_SUFFIX=$(PTP_SUFFIX) \
+		GLOBAL_CODE_SIGN_STYLE=$(GLOBAL_CODE_SIGN_STYLE) \
+		APP_PROVISIONING_PROFILE_ID=$(APP_PROVISIONING_PROFILE_ID) \
+		EXT_PROVISIONING_PROFILE_ID=$(EXT_PROVISIONING_PROFILE_ID) \
 		xcodegen
 
 $(PROJECT)/VPNLib/vpn.pb.swift: $(PROJECT)/VPNLib/vpn.proto

scripts/build.sh

@@ -11,8 +11,11 @@ get_uuid() {
 XCODE_PROVISIONING_PROFILES_DIR="$HOME/Library/Developer/Xcode/UserData/Provisioning Profiles"
 CODE_SIGN_IDENTITY="Developer ID Application: Coder Technologies Inc (4399GN35BJ)"
 
-app_prof_id=$(get_uuid "$APP_PROF_PATH")
-ext_prof_id=$(get_uuid "$EXT_PROF_PATH")
+export APP_PROVISIONING_PROFILE_ID=$(get_uuid "$APP_PROF_PATH")
+export EXT_PROVISIONING_PROFILE_ID=$(get_uuid "$EXT_PROF_PATH")
+export RELEASE_BUILD=true
+# `xcodegen` environment variables set
+make
 
 # Install Provisioning Profiles
 cp "$APP_PROF_PATH" "${XCODE_PROVISIONING_PROFILES_DIR}/${app_prof_id}.provisionprofile"