Version bump restore 11.0.0 with CI fix (#875)

Author: d4r1091

.circleci/config.yml

@@ -92,11 +92,12 @@ workflows:
           filters:
             branches:
               only:
-                - /^.*main.*/
-          name: Deploy release version over Testflight if MARKETING_VERION file updated
+                - main
+                - /^main-\d+$/
+          name: Deploy release version over Testflight if MARKETING_VERSION file updated
           config-path: .circleci/deploy-release.yml
           mapping: |
-            Client/Configuration/Common.xcconfig deploy-release true
+            firefox-ios/Client/Configuration/Common.xcconfig deploy-release true
       - build-and-deploy-testflight-beta:
           name: Deploy beta version over Testflight
           filters:
@@ -109,5 +110,5 @@ workflows:
           filters:
             branches:
               only: 
-                - /^.*mob-3113-firefox-upgrade-133.*/
+                - /^.*main.*/
           context: napps

.circleci/deploy-release.yml

@@ -34,7 +34,7 @@ jobs:
           command: for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts
       - run:
           name: extract Production XCConfig
-          command: echo "$PRODUCTION_XCCONFIG" | base64 --decode > Client/Configuration/Production.xcconfig
+          command: echo "$PRODUCTION_XCCONFIG" | base64 --decode > firefox-ios/Client/Configuration/Production.xcconfig
       - run:
           name: Execute bootstrap
           command: ./bootstrap.sh

.github/workflows/merge_tests.yml

@@ -2,7 +2,7 @@ name: Merge Unit Tests
 
 on:
   pull_request:
-    branches: [ main, mob-3113-firefox-upgrade-133 ]
+    branches: [main]
 
 jobs:
   execute_merge_tests:

.github/workflows/snapshot_tests.yml

@@ -3,7 +3,7 @@ name: Snapshot Tests
 on:
   pull_request:
     paths:
-      - 'Client/Configuration/Common.xcconfig'
+      - 'firefox-ios/Client/Configuration/Common.xcconfig'
 
 jobs:
   execute_snapshot_tests:

.github/workflows/swift_lint.yml

@@ -1,7 +1,7 @@
 name: SwiftLint
 on:
   pull_request:
-    branches: [ main, mob-3113-firefox-upgrade-133 ]
+    branches: [main]
 jobs:
   build:
     runs-on: ubuntu-latest

check_marketing_version.sh

@@ -11,15 +11,15 @@
 #!/bin/bash
 
 # Get the current branch's MARKETING_VERSION
-CURRENT_VERSION=$(grep 'MARKETING_VERSION' Client/Configuration/Common.xcconfig | cut -d ' ' -f3)
+CURRENT_VERSION=$(grep 'MARKETING_VERSION' firefox-ios/Client/Configuration/Common.xcconfig | cut -d ' ' -f3)
 
 if [ -n "$CIRCLECI" ]; then
   # CircleCI: Compare against the previous commit on the same branch
   echo "Running on CircleCI, checking against $CIRCLE_BRANCH~1"
 
   # Check if there is a previous commit available
   if git rev-parse "$CIRCLE_BRANCH~1" >/dev/null 2>&1; then
-    OLD_VERSION=$(git show "$CIRCLE_BRANCH~1:Client/Configuration/Common.xcconfig" | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
+    OLD_VERSION=$(git show "$CIRCLE_BRANCH~1:firefox-ios/Client/Configuration/Common.xcconfig" | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
   else
     echo "No previous commit found on $CIRCLE_BRANCH. Assuming the current version."
     OLD_VERSION=$CURRENT_VERSION
@@ -33,7 +33,7 @@ elif [ -n "$GITHUB_ACTIONS" ]; then
   git fetch origin main || { echo "Failed to fetch main branch"; exit 1; }
 
   # Get the MARKETING_VERSION from the main branch
-  OLD_VERSION=$(git show origin/main:Client/Configuration/Common.xcconfig | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
+  OLD_VERSION=$(git show origin/main:firefox-ios/Client/Configuration/Common.xcconfig | grep 'MARKETING_VERSION' | cut -d ' ' -f3)
   if [ $? -ne 0 ]; then
     echo "Failed to retrieve MARKETING_VERSION from main branch"
     exit 1

firefox-ios/Client/Configuration/Common.xcconfig

@@ -35,4 +35,4 @@ DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = 1;
 DYLIB_INSTALL_NAME_BASE = @rpath
 PRODUCT_BUNDLE_IDENTIFIER = org.mozilla.ios.$(PRODUCT_NAME)
-MARKETING_VERSION = 10.6.1
+MARKETING_VERSION = 11.0.0