-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added FXIOS-10710 default browser telemetry (#23426) * Add default browser utility * Add telemetry * Telemetry tests * Add tests * Fix tests * Update bitrise to use 18.2 * Fix linting * Fix typo * Disable warnings as errors * Up the number of warnings * Revert "Update bitrise to use 18.2" This reverts commit 2e03e5a. * Update bitrise * Fix bitrise * Fix bitrise * Fix concurrency errors * Update api * Update sim versions * Fix test (cherry picked from commit 475c70f) # Conflicts: # bitrise.yml # firefox-ios/Client.xcodeproj/project.pbxproj # firefox-ios/Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved * Update Package.resolved * Update bitrise.yml * Fix conflicts --------- Co-authored-by: OrlaM <[email protected]>
- Loading branch information
1 parent
0cfd62f
commit 097dd46
Showing
17 changed files
with
428 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,17 +55,17 @@ workflows: | |
| mkdir DerivedData | ||
| xcodebuild -resolvePackageDependencies -onlyUsePackageVersionsFromResolvedFile | ||
| xcodebuild "-project" "/Users/vagrant/git/firefox-ios/Client.xcodeproj" "-scheme" "Fennec" -configuration "Fennec_Testing" "CODE_SIGNING_ALLOWED=NO" -sdk "iphonesimulator" "-destination" "platform=iOS Simulator,name=iPhone 16,OS=18.1" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_fennec.log | ||
| xcodebuild "-project" "/Users/vagrant/git/firefox-ios/Client.xcodeproj" "-scheme" "Fennec" -configuration "Fennec_Testing" "CODE_SIGNING_ALLOWED=NO" -sdk "iphonesimulator" "-destination" "platform=iOS Simulator,name=iPhone 16,OS=18.2" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_fennec.log | ||
| ls /Users/vagrant/git/DerivedData/Build/Products | ||
| ls /Users/vagrant/git/DerivedData | ||
| - xcode-test-without-building@0: | ||
| run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}' | ||
| timeout: 600 | ||
| inputs: | ||
| - destination: platform=iOS Simulator,name=iPhone 16,OS=18.1 | ||
| - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2 | ||
| - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' | ||
| - xctestrun: "/Users/vagrant/git/DerivedData/Build/Products/Fennec_UnitTest_iphonesimulator18.1-arm64.xctestrun" | ||
| - xctestrun: "/Users/vagrant/git/DerivedData/Build/Products/Fennec_UnitTest_iphonesimulator18.2-arm64.xctestrun" | ||
| - maximum_test_repetitions: 2 | ||
| - save-spm-cache@1: | ||
| is_always_run: true | ||
|
|
@@ -205,10 +205,10 @@ workflows: | |
| run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}' | ||
| timeout: 1200 | ||
| inputs: | ||
| - destination: platform=iOS Simulator,name=iPhone 16,OS=18.1 | ||
| - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2 | ||
| - xcodebuild_options: '"-derivedDataPath" "/Users/vagrant/git/DerivedData" "COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"' | ||
| - xctestrun: "Users/vagrant/git/DerivedData/Build/Products/Fennec_Smoketest${SHARD}_iphonesimulator18.1-arm64.xctestrun" | ||
| - deploy-to-bitrise-io@2.1.1: | ||
| - xctestrun: "Users/vagrant/git/DerivedData/Build/Products/Fennec_Smoketest${SHARD}_iphonesimulator18.2-arm64.xctestrun" | ||
| - deploy-to-bitrise-io@2.9.2: | ||
| run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}' | ||
| inputs: | ||
| - pipeline_intermediate_files: '$BITRISE_XCRESULT_PATH:BITRISE_UITESTS_${SHARD}_XCRESULT_PATH' | ||
|
|
@@ -738,8 +738,8 @@ workflows: | |
| run_if: '{{getenv "NEW_XCODE_VERSION" | eq "New_Version_Found" | or (getenv "RUN_ALL_STEPS" | eq "Run_All_Steps")}}' | ||
| inputs: | ||
| - scheme: Fennec | ||
| - destination: platform=iOS Simulator,name=iPhone 16,OS=18.1 | ||
| - [email protected]: {} | ||
| - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2 | ||
| - deploy-to-bitrise-io@2.9.2: {} | ||
| - [email protected]: {} | ||
| - [email protected]: | ||
| run_if: '{{getenv "NEW_XCODE_VERSION" | eq "New_Version_Found" | or (getenv "RUN_ALL_STEPS" | eq "Run_All_Steps")}}' | ||
|
|
@@ -751,7 +751,7 @@ workflows: | |
| description: This Workflow is to build the app using latest xcode available in Bitrise | ||
| meta: | ||
| bitrise.io: | ||
| stack: osx-xcode-16.1.x | ||
| stack: osx-xcode-16.2.x-edge | ||
| machine_type_id: g2-m1.8core | ||
| L10nBuild: | ||
| steps: | ||
|
|
@@ -1203,7 +1203,7 @@ workflows: | |
| inputs: | ||
| - project_path: firefox-ios/Client.xcodeproj | ||
| - scheme: Fennec | ||
| - destination: platform=iOS Simulator,name=iPhone 16,OS=18.1 | ||
| - destination: platform=iOS Simulator,name=iPhone 16,OS=18.2 | ||
| - test_plan: PerformanceTestPlan | ||
| - [email protected]: | ||
| is_always_run: true | ||
|
|
@@ -1592,14 +1592,14 @@ workflows: | |
| echo "-- build-for-testing --" | ||
| mkdir DerivedData | ||
| #xcodebuild -resolvePackageDependencies -onlyUsePackageVersionsFromResolvedFile | ||
| xcodebuild "-project" "/Users/vagrant/git/focus-ios/Blockzilla.xcodeproj" "-scheme" "Focus" -configuration "FocusDebug" "CODE_SIGNING_ALLOWED=NO" "-destination" "platform=iOS Simulator,name=iPhone 16,OS=18.1" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_test.log | ||
| xcodebuild "-project" "/Users/vagrant/git/focus-ios/Blockzilla.xcodeproj" "-scheme" "Focus" -configuration "FocusDebug" "CODE_SIGNING_ALLOWED=NO" "-destination" "platform=iOS Simulator,name=iPhone 16,OS=18.2" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_test.log | ||
| - [email protected]: | ||
| title: Build for Testing Klar | ||
| inputs: | ||
| - content: | | ||
| set -euxo pipefail | ||
| echo "-- build-for-testing --" | ||
| xcodebuild "-project" "/Users/vagrant/git/focus-ios/Blockzilla.xcodeproj" "-scheme" "Klar" -configuration "KlarDebug" "CODE_SIGNING_ALLOWED=NO" "-destination" "platform=iOS Simulator,name=iPhone 16,OS=18.1" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_test.log | ||
| xcodebuild "-project" "/Users/vagrant/git/focus-ios/Blockzilla.xcodeproj" "-scheme" "Klar" -configuration "KlarDebug" "CODE_SIGNING_ALLOWED=NO" "-destination" "platform=iOS Simulator,name=iPhone 16,OS=18.2" "COMPILER_INDEX_STORE_ENABLE=NO" "build-for-testing" "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO" -derivedDataPath "/Users/vagrant/git/DerivedData" | xcpretty | tee xcodebuild_test.log | ||
| - [email protected]: | ||
| title: Compress Derived Data | ||
| is_always_run: true | ||
|
|
@@ -1666,7 +1666,7 @@ workflows: | |
| mv ./Users/vagrant/git/* . | ||
| ls -la | ||
| echo "-- test-without-building --" | ||
| xcodebuild -resultBundlePath "xcodebuild.xcresult" -derivedDataPath "/Users/vagrant/git/DerivedData" -destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" test-without-building -xctestrun "/Users/vagrant/git/DerivedData/Build/Products/Focus_SmokeTest_iphonesimulator18.1-arm64.xctestrun" | ||
| xcodebuild -resultBundlePath "xcodebuild.xcresult" -derivedDataPath "/Users/vagrant/git/DerivedData" -destination "platform=iOS Simulator,name=iPhone 16,OS=18.2" test-without-building -xctestrun "/Users/vagrant/git/DerivedData/Build/Products/Focus_SmokeTest_iphonesimulator18.2-arm64.xctestrun" | ||
| - custom-test-results-export@0: | ||
| inputs: | ||
| - search_pattern: "$BITRISE_SOURCE_DIR/xcodebuild.xcresult" | ||
|
|
@@ -1696,7 +1696,7 @@ workflows: | |
| mv ./Users/vagrant/git/* . | ||
| ls -la | ||
| echo "-- test-without-building --" | ||
| xcodebuild -resultBundlePath "xcodebuild.xcresult" -derivedDataPath "/Users/vagrant/git/DerivedData" -destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" test-without-building -xctestrun "/Users/vagrant/git/DerivedData/Build/Products/Klar_UnitTests_iphonesimulator18.1-arm64.xctestrun" | ||
| xcodebuild -resultBundlePath "xcodebuild.xcresult" -derivedDataPath "/Users/vagrant/git/DerivedData" -destination "platform=iOS Simulator,name=iPhone 16,OS=18.2" test-without-building -xctestrun "/Users/vagrant/git/DerivedData/Build/Products/Klar_UnitTests_iphonesimulator18.2-arm64.xctestrun" | ||
| - custom-test-results-export@0: | ||
| inputs: | ||
| - search_pattern: "$BITRISE_SOURCE_DIR/xcodebuild.xcresult" | ||
|
|
@@ -1724,7 +1724,7 @@ workflows: | |
| mv ./Users/vagrant/git/* . | ||
| ls -la | ||
| echo "-- test-without-building --" | ||
| xcodebuild -resultBundlePath "xcodebuild.xcresult" -derivedDataPath "/Users/vagrant/git/DerivedData" -destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" test-without-building -xctestrun "/Users/vagrant/git/DerivedData/Build/Products/Focus_UnitTests_iphonesimulator18.1-arm64.xctestrun" | ||
| xcodebuild -resultBundlePath "xcodebuild.xcresult" -derivedDataPath "/Users/vagrant/git/DerivedData" -destination "platform=iOS Simulator,name=iPhone 16,OS=18.2" test-without-building -xctestrun "/Users/vagrant/git/DerivedData/Build/Products/Focus_UnitTests_iphonesimulator18.2-arm64.xctestrun" | ||
| - custom-test-results-export@0: | ||
| inputs: | ||
| - search_pattern: "$BITRISE_SOURCE_DIR/xcodebuild.xcresult" | ||
|
|
@@ -2127,5 +2127,5 @@ trigger_map: | |
|
|
||
| meta: | ||
| bitrise.io: | ||
| stack: osx-xcode-16.1.x | ||
| stack: osx-xcode-16.2.x-edge | ||
| machine_type_id: g2-m1.8core | ||
Oops, something went wrong.
097dd46There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Uh oh! Looks like an error!
InterpreterError at template.tasks[0].extra[0].treeherder[1].symbol: unknown context value cron