Updating release process and notes

SteffeyDev · Nov 15, 2021 · b623f16 · b623f16
1 parent 48b9e79
commit b623f16
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -441,7 +441,7 @@ I welcome pull requests, but recommend that you open an issue first so that we c
 ### Deployment
 
 1. Bump the version in XCode
-2. Build app from XCode
-3. Run generate-release.sh to generate the installer
-4. Run notarize-dmg.sh to notarize the installer
+2. Archive app from XCode
+3. Generate notarized app by using the "Distribute App" wizard: Developer ID > Upload > Automatically Manage Signing > Upload > Wait for notarization to complete > Export
+3. Run generate-release.sh to generate the notarized installer (argument is path to exported atemOSC.app file from the last step)
 5. Run upload-symbols.sh to upload the symbols to Bugsnag
diff --git a/atemOSC/atemOSC.xcodeproj/project.pbxproj b/atemOSC/atemOSC.xcodeproj/project.pbxproj
@@ -28,11 +28,12 @@
 		A9A9AA932594255A00890134 /* VVBasics.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A9A9A9452594209100890134 /* VVBasics.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A9A9AA942594255A00890134 /* VVOSC.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A9A9A9472594209100890134 /* VVOSC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A9D0B4DF259FCE5D00FF0733 /* LogView.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9D0B4DE259FCE5D00FF0733 /* LogView.mm */; };
+		A9EFFF1B2742A70700EA8FCE /* Bugsnag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9F4DDB62711276E007E64DE /* Bugsnag.framework */; };
+		A9EFFF1C2742A70700EA8FCE /* Bugsnag.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A9F4DDB62711276E007E64DE /* Bugsnag.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A9F4DDB927112779007E64DE /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9F4DDB827112779007E64DE /* SystemConfiguration.framework */; };
 		A9F4DDBB27112788007E64DE /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A9F4DDBA27112788007E64DE /* libc++.tbd */; };
 		A9F4DDBD2711278F007E64DE /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A9F4DDBC2711278F007E64DE /* libz.tbd */; };
 		A9F4DDC027112835007E64DE /* BugsnagExceptionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F4DDBF27112835007E64DE /* BugsnagExceptionHandler.m */; };
-		A9F4DDC827112C69007E64DE /* Bugsnag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9F4DDB62711276E007E64DE /* Bugsnag.framework */; };
 		A9F7906A1F89B83D003ACBCF /* OSCReceiver.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9F790691F89B83C003ACBCF /* OSCReceiver.mm */; };
 		A9FB8B5A25943693003B4581 /* VVBasics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A9A9452594209100890134 /* VVBasics.framework */; };
 		A9FB8B5B25943693003B4581 /* VVOSC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A9A9472594209100890134 /* VVOSC.framework */; };
@@ -47,6 +48,7 @@
 			files = (
 				A9A9AA932594255A00890134 /* VVBasics.framework in CopyFiles */,
 				A9A9AA942594255A00890134 /* VVOSC.framework in CopyFiles */,
+				A9EFFF1C2742A70700EA8FCE /* Bugsnag.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -107,12 +109,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A9F4DDC827112C69007E64DE /* Bugsnag.framework in Frameworks */,
 				A9F4DDBD2711278F007E64DE /* libz.tbd in Frameworks */,
 				A9F4DDBB27112788007E64DE /* libc++.tbd in Frameworks */,
 				A9F4DDB927112779007E64DE /* SystemConfiguration.framework in Frameworks */,
 				A9FB8B5A25943693003B4581 /* VVBasics.framework in Frameworks */,
 				A9FB8B5B25943693003B4581 /* VVOSC.framework in Frameworks */,
+				A9EFFF1B2742A70700EA8FCE /* Bugsnag.framework in Frameworks */,
 				333E3045161395CF0002287B /* IOKit.framework in Frameworks */,
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
 			);
@@ -388,7 +390,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
 				MACH_O_TYPE = mh_execute;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 4.2;
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atemosc.atemOSC;
 				PRODUCT_NAME = atemOSC;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -429,7 +431,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @executable_path/../Frameworks";
 				MACH_O_TYPE = mh_execute;
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 4.2;
+				MARKETING_VERSION = 4.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.atemosc.atemOSC;
 				PRODUCT_NAME = atemOSC;
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/generate-release.sh b/generate-release.sh
@@ -17,6 +17,14 @@ RED_COLOR="\033[0;31m"
 GREY_COLOR="\033[0;37m"
 NO_COLOR="\033[0m"
 
+#
+# Check arguments
+#
+if [[ -z $1 ]] ; then
+  echo -e "Pass in the path to the notarized atemOSC.app file as the first argument"
+  exit 1
+fi
+
 #
 # Check if Github auth token exists
 #
@@ -112,23 +120,13 @@ if [[ $? != 0 ]] ; then
 	exit 1
 fi
 
-# Create tag if needed
-if [ $(git tag -l "v$VERSION" | wc -l | xargs) -eq 0 ]; then
-  git tag -a "v$VERSION" -m "v$VERSION"
-  git push --tags
-fi
-
 #
 # Creating directory to work in
 #
 rm -rf temp_output
 mkdir -p temp_output
 cd temp_output
 
-if [[ -z $1 ]] ; then
-  echo -e "Pass in the path to the notarized atemOSC.app file as the first argument"
-  exit 1
-fi
 cp -R "$1" .
 
 #
@@ -146,6 +144,14 @@ FILENAME=$(find atemOSC_*.dmg)
 NEXT_RELEASE=$(echo $FILENAME | sed -E 's/atemOSC_(.*).dmg/\1/')
 echo -e "Generated: ${GREY_COLOR}${FILENAME}${NO_COLOR}"
 
+#
+# Create tag if needed
+#
+if [ $(git tag -l "v$NEXT_RELEASE" | wc -l | xargs) -eq 0 ]; then
+  git tag -a "v$NEXT_RELEASE" -m "v$NEXT_RELEASE"
+  git push --tags
+fi
+
 #
 # Notarize installer
 #