From d1a65d554780900cc3e2c60647cd6679493d73f7 Mon Sep 17 00:00:00 2001
From: Dario Carlomagno <dario.carlomagno@ecosia.org>
Date: Tue, 18 Mar 2025 17:43:40 +0100
Subject: [PATCH 1/4] Reapply "Version bump 11.0.0 (#872)" (#874)

This reverts commit 3814901ea201c579415493b9fb47deaaac480d97.
---
 .circleci/config.yml                             | 2 +-
 .github/workflows/merge_tests.yml                | 2 +-
 .github/workflows/snapshot_tests.yml             | 2 +-
 .github/workflows/swift_lint.yml                 | 2 +-
 firefox-ios/Client/Configuration/Common.xcconfig | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 02ed5e1fe7ce..1b9fcf0268e7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -109,5 +109,5 @@ workflows:
           filters:
             branches:
               only: 
-                - /^.*mob-3113-firefox-upgrade-133.*/
+                - /^.*main.*/
           context: napps
\ No newline at end of file
diff --git a/.github/workflows/merge_tests.yml b/.github/workflows/merge_tests.yml
index 9f1b77ab61dd..244a028909ec 100644
--- a/.github/workflows/merge_tests.yml
+++ b/.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:
diff --git a/.github/workflows/snapshot_tests.yml b/.github/workflows/snapshot_tests.yml
index 28a35f7cdb5e..e8db8972f4bf 100644
--- a/.github/workflows/snapshot_tests.yml
+++ b/.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:
diff --git a/.github/workflows/swift_lint.yml b/.github/workflows/swift_lint.yml
index a8fee2956a69..77ff087b52dd 100644
--- a/.github/workflows/swift_lint.yml
+++ b/.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
diff --git a/firefox-ios/Client/Configuration/Common.xcconfig b/firefox-ios/Client/Configuration/Common.xcconfig
index 566ce4734557..9b758e342a5b 100644
--- a/firefox-ios/Client/Configuration/Common.xcconfig
+++ b/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

From 9df56970a68ba169e3685d11a2fb98d44dd39dcb Mon Sep 17 00:00:00 2001
From: Dario Carlomagno <dario.carlomagno@ecosia.org>
Date: Tue, 18 Mar 2025 17:45:05 +0100
Subject: [PATCH 2/4] Fix deploy-release path check

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b9fcf0268e7..325358ccb9f1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,7 +96,7 @@ workflows:
           name: Deploy release version over Testflight if MARKETING_VERION 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:

From 6972b5c196c66a40ef48b8fb78ef12468f8d5963 Mon Sep 17 00:00:00 2001
From: Dario Carlomagno <dario.carlomagno@ecosia.org>
Date: Tue, 18 Mar 2025 17:46:42 +0100
Subject: [PATCH 3/4] Fix typo in CI job

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 325358ccb9f1..758affe192f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -93,7 +93,7 @@ workflows:
             branches:
               only:
                 - /^.*main.*/
-          name: Deploy release version over Testflight if MARKETING_VERION file updated
+          name: Deploy release version over Testflight if MARKETING_VERSION file updated
           config-path: .circleci/deploy-release.yml
           mapping: |
             firefox-ios/Client/Configuration/Common.xcconfig deploy-release true

From 15bd801396ad49ca1ef55c532a7c82eba2a24898 Mon Sep 17 00:00:00 2001
From: Dario Carlomagno <dario.carlomagno@ecosia.org>
Date: Tue, 18 Mar 2025 16:52:27 +0100
Subject: [PATCH 4/4] [MAIN-122] Restrict to `main` and `main-[any-number]`

# Conflicts:
#	.circleci/config.yml
---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 758affe192f8..976ec1b1fed0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,7 +92,8 @@ workflows:
           filters:
             branches:
               only:
-                - /^.*main.*/
+                - main
+                - /^main-\d+$/
           name: Deploy release version over Testflight if MARKETING_VERSION file updated
           config-path: .circleci/deploy-release.yml
           mapping: |