Debug App Store workflows

.github/workflows/appstore-testflight.yml

@@ -29,9 +29,10 @@ jobs:
     needs: check_date
     if: ${{ needs.check_date.outputs.should_run != 'false' }}
     continue-on-error: false
-    env:
-      TURBO_TEAM: ${{ vars.TURBO_TEAM }}
-      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+    # Disable Turbo to see if that fixes the build - possible cache issue
+    # env:
+    #   TURBO_TEAM: ${{ vars.TURBO_TEAM }}
+    #   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
     steps:
       - uses: actions/checkout@v4
       - name: Cache node modules
@@ -61,8 +62,9 @@ jobs:
           fi
 
       - name: Install jq
-        run: sudo apt-get install -y jq
-
+        run: |
+          brew update
+          brew install jq
       - name: Declare some variables
         shell: bash
         run: |
@@ -71,7 +73,7 @@ jobs:
       - name: Create version string
         shell: bash
         run: |
-          echo "version_string=v${{env.app_version}}-android-#${{env.sha_short}}" >> "$GITHUB_ENV"        
+          echo "version_string=v${{env.app_version}}-ios-#${{env.sha_short}}" >> "$GITHUB_ENV"        
 
       - name: Set up ruby env
         uses: ruby/setup-ruby@v1
@@ -122,7 +124,7 @@ jobs:
         uses: maierj/fastlane-action@v2.3.0
         with:
           lane: closed_beta_testflight
-          subdirectory: 'ios/App'
+          subdirectory: 'app/ios/App'
           bundle-install-path: '$HOME/vendor/bundle'
           verbose: false
         env:

app/bin/prebuildConfig.sh

@@ -47,3 +47,23 @@ if test -f icons/icon-48.webp; then
   mkdir -p ./public/assets
   mv icons ./public/assets/icons
 fi
+
+
+## IOS specific configuration
+
+# Setting the IOS build version
+# https://pgu.dev/2020/12/16/ios-build-versioning.html
+
+#version=$(grep '"version":' $PROJECT_DIR/package.json | cut -d: -f 2 | sed -e 's/[", ]//g')
+# since we previously published 1.0.0 on app store we need a higher version
+# number, set that here until we get the main version above this
+version=1.0.4
+buildNumber=$(date -u "+%Y%m%d%H%M")
+
+if test -f /usr/libexec/PlistBuddy; then
+  echo "\nIOS: Configuring Info.plist settings"
+  /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $buildNumber" ./ios/App/App/Info.plist
+  /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $version" ./ios/App/App/Info.plist
+  /usr/libexec/PlistBuddy -c "Set :CFBundleURLTypes:0:CFBundleURLSchemes:0 $VITE_APP_ID" ./ios/App/App/Info.plist
+  /usr/libexec/PlistBuddy -c "Set :CFBundleURLTypes:0:CFBundleURLName $VITE_APP_ID" ./ios/App/App/Info.plist
+fi

app/ios/App/App.xcodeproj/project.pbxproj

@@ -11,7 +11,6 @@
 			isa = PBXAggregateTarget;
 			buildConfigurationList = D364126F278CFCD50019D84B /* Build configuration list for PBXAggregateTarget "Version" */;
 			buildPhases = (
-				D3641270278CFCD90019D84B /* ShellScript */,
 			);
 			dependencies = (
 			);
@@ -236,26 +235,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D3641270278CFCD90019D84B /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/Scripts/get_build_number.sh",
-				"$(SRCROOT)/App/Info.plist",
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"$SRCROOT\"/Scripts/get_build_number.sh\n";
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -428,7 +407,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_PREFIX_HEADER = Plist/Prefix;
-				INFOPLIST_PREPROCESS = YES;
+				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -462,7 +441,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_PREFIX_HEADER = Plist/Prefix;
-				INFOPLIST_PREPROCESS = YES;
+				INFOPLIST_PREPROCESS = NO;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

app/ios/App/App/Info.plist

@@ -17,20 +17,20 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
 			<key>CFBundleURLName</key>
-			<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+			<string>au.edu.faims.fieldmark</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>org.fedarch.faims3</string>
+				<string>au.edu.faims.fieldmark</string>
 			</array>
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>202409110011</string>
+	<string>202412012317</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

app/ios/App/Gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+gem "cocoapods"
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)

app/ios/App/fastlane/Fastfile

@@ -34,48 +34,7 @@ def ensure_temp_keychain(name, password)
 end
 
 platform :ios do
-  lane :test_ipa do
-    keychain_name = TEMP_KEYCHAIN_USER
-    keychain_password = TEMP_KEYCHAIN_PASSWORD
-    ensure_temp_keychain(keychain_name, keychain_password)
-
-    api_key = app_store_connect_api_key(
-      key_id: APPLE_KEY_ID,
-      issuer_id: APPLE_ISSUER_ID,
-      key_content: APPLE_KEY_CONTENT,
-      duration: 1200,
-      in_house: false
-    )
-
-    #increment_build_number(xcodeproj: "App.xcodeproj")
-    #handled by script and xcode in build phases, I hope.
-
-    cocoapods(
-      clean_install: true
-    )
-
-    match(
-      type: 'development',
-      app_identifier: "#{DEVELOPER_APP_IDENTIFIER}",
-      git_basic_authorization: Base64.strict_encode64(ENV["GIT_AUTHORIZATION"]),
-      readonly: false,
-      keychain_name: keychain_name,
-      keychain_password: keychain_password,
-      api_key: api_key
-    )
-
-    gym(
-      configuration: "Debug",
-      workspace: "App.xcworkspace",
-      scheme: "App",
-      export_method: "development",
-      export_options: {
-        provisioningProfiles: {
-            DEVELOPER_APP_ID => "match Development #{DEVELOPER_APP_IDENTIFIER}"
-        }
-      }
-    )
-  end
+
   lane :closed_beta_browserstack do
     keychain_name = TEMP_KEYCHAIN_USER
     keychain_password = TEMP_KEYCHAIN_PASSWORD
@@ -124,6 +83,8 @@ platform :ios do
       custom_id: "ios-github-actions-fastlane"
     )
   end
+
+
   lane :closed_beta_testflight do
     keychain_name = TEMP_KEYCHAIN_USER
     keychain_password = TEMP_KEYCHAIN_PASSWORD
@@ -171,7 +132,6 @@ platform :ios do
       merge_commit_filtering: "exclude_merges"
     )
 
-
     pilot(
       apple_id: "#{DEVELOPER_APP_ID}",
       app_identifier: "#{DEVELOPER_APP_IDENTIFIER}",