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