diff --git a/scripts/build/ios-appstore.sh b/scripts/build/ios-appstore.sh index c0e385920..c7b5bf0b3 100755 --- a/scripts/build/ios-appstore.sh +++ b/scripts/build/ios-appstore.sh @@ -7,8 +7,8 @@ set -euo pipefail source "./scripts/build/lib.sh" # Define needed variables -app_profile_id=8da59aa3-e8da-4a8c-9902-2d540324d92c -ne_profile_id=0fccb78a-97c0-41b9-8c54-9c995280ea8e +app_profile_id=$(extract_uuid "$IOS_APP_PROVISIONING_PROFILE") +ne_profile_id=$(extract_uuid "$IOS_NE_PROVISIONING_PROFILE") temp_dir="${TEMP_DIR:-$(mktemp -d)}" archive_path="$temp_dir/Firezone.xcarchive" export_options_plist_path="$temp_dir/ExportOptions.plist" diff --git a/scripts/build/lib.sh b/scripts/build/lib.sh index 0ba4109e0..c8b9733aa 100755 --- a/scripts/build/lib.sh +++ b/scripts/build/lib.sh @@ -56,6 +56,12 @@ function setup_runner() { "$keychain_path" } +function extract_uuid() { + local b64_profile="$1" + + echo "$b64_profile" | base64 --decode | security cms -D | plutil -extract UUID raw -o - - +} + function base64_decode() { local input_stdin="$1" local output_path="$2" diff --git a/scripts/build/macos-appstore.sh b/scripts/build/macos-appstore.sh index e3f78f881..65561357f 100755 --- a/scripts/build/macos-appstore.sh +++ b/scripts/build/macos-appstore.sh @@ -7,8 +7,8 @@ set -euo pipefail source "./scripts/build/lib.sh" # Define needed variables -app_profile_id=2bf20e38-81ea-40d0-91e5-330cf58f52d9 -ne_profile_id=2c683d1a-4479-451c-9ee6-ae7d4aca5c93 +app_profile_id=$(extract_uuid "$MACOS_APP_PROVISIONING_PROFILE") +ne_profile_id=$(extract_uuid "$MACOS_NE_PROVISIONING_PROFILE") temp_dir="${TEMP_DIR:-$(mktemp -d)}" package_path="$temp_dir/Firezone.pkg" git_sha=${GITHUB_SHA:-$(git rev-parse HEAD)} diff --git a/scripts/build/macos-standalone.sh b/scripts/build/macos-standalone.sh index e5784b0e9..4bfbdfe68 100755 --- a/scripts/build/macos-standalone.sh +++ b/scripts/build/macos-standalone.sh @@ -7,8 +7,8 @@ set -euo pipefail source "./scripts/build/lib.sh" # Define needed variables -app_profile_id=c5d97f71-de80-4dfc-80f8-d0a4393ff082 -ne_profile_id=153db941-2136-4d6c-96ef-52f748521e78 +app_profile_id=$(extract_uuid "$STANDALONE_MACOS_APP_PROVISIONING_PROFILE") +ne_profile_id=$(extract_uuid "$STANDALONE_MACOS_NE_PROVISIONING_PROFILE") notarize=${NOTARIZE:-"false"} temp_dir="${TEMP_DIR:-$(mktemp -d)}" dmg_dir="$temp_dir/dmg" diff --git a/swift/apple/README.md b/swift/apple/README.md index 0770c3a38..49b2343ca 100644 --- a/swift/apple/README.md +++ b/swift/apple/README.md @@ -272,12 +272,6 @@ APPLE_MACOS_NE_PROVISIONING_PROFILE base64 < profile.mobileprovision ``` -1. Now, you need to update the build scripts to use these. Edit - `scripts/build/*-appstore.sh` and update the provisioning profile UUIDs. The - UUID can be found by grepping for them in the provisioning profile files - themselves, or just opening them in a text editor and looking halfway down - the file. They should be the only UUIDs in the file. - ## Generating new signing certificates and provisioning profiles for standalone distribution The process is much the same as above for the macOS standalone client, with one