Bugfix MTE-2964 Make "Bitrise Xcode Check and Update" works again (mozilla-mobile#20992)

* Reformat bitrise.yml by ruamel.yaml

* Use default stack instead of latest/edge stacks

* Modify stack just for NewXcodeVersions

Author: clarmso

bitrise.yml

@@ -47,15 +47,15 @@ workflows:
     - restore-spm-cache@1:
         is_always_run: true
     - git::https://github.com/DamienBitrise/bitrise-test-plan-sharder.git@master:
-          title: Bitrise Test Plan Sharder
-          inputs:
-            - xcode_project: Client.xcodeproj
-            - target: Client
-            - shards: '4'
-            - scheme: Fennec
-            - debug_mode: 'true'
-            - test_path: ''
-            - file_type: ".swift"
+        title: Bitrise Test Plan Sharder
+        inputs:
+        - xcode_project: Client.xcodeproj
+        - target: Client
+        - shards: '4'
+        - scheme: Fennec
+        - debug_mode: 'true'
+        - test_path: ''
+        - file_type: ".swift"
     - [email protected]:
         title: Build for Testing
         inputs:
@@ -74,8 +74,7 @@ workflows:
         timeout: 600
         inputs:
         - destination: platform=iOS Simulator,name=iPhone 15,OS=17.5
-        - xcodebuild_options: '"COMPILER_INDEX_STORE_ENABLE=NO"
-            "CODE_SIGN_IDENTITY=" "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
+        - 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_iphonesimulator17.5-arm64.xctestrun"
         - maximum_test_repetitions: 2
     - save-spm-cache@1:
@@ -132,7 +131,7 @@ workflows:
 
             echo "bitrise_xcode"
             COUNT_XCUI=$(./test-fixtures/generate-metrics.sh /Users/vagrant/git/xcodebuild_fennec.log all)
-            
+
             envman add --key SHOW_WARNING_IN_SLACK --value Show_Warnings
             envman add --key SHOW_WARNING_COUNT_XCUI --value "$COUNT_XCUI"
 
@@ -174,35 +173,35 @@ workflows:
 
   build_and_test_1_SmokeTest1:
     envs:
-      - opts:
-          is_expand: false
-        SHARD: '1'
+    - opts:
+        is_expand: false
+      SHARD: '1'
     after_run:
-      - _build_and_test
+    - _build_and_test
 
   build_and_test_2_SmokeTest2:
     envs:
-      - opts:
-          is_expand: false
-        SHARD: '2'
+    - opts:
+        is_expand: false
+      SHARD: '2'
     after_run:
-      - _build_and_test
+    - _build_and_test
 
   build_and_test_3_SmokeTest3:
     envs:
-      - opts:
-          is_expand: false
-        SHARD: '3'
+    - opts:
+        is_expand: false
+      SHARD: '3'
     after_run:
-      - _build_and_test
+    - _build_and_test
 
   build_and_test_4_SmokeTest4:
     envs:
-      - opts:
-          is_expand: false
-        SHARD: '4'
+    - opts:
+        is_expand: false
+      SHARD: '4'
     after_run:
-      - _build_and_test
+    - _build_and_test
 
   _build_and_test:
     before_run:
@@ -216,15 +215,12 @@ workflows:
         timeout: 1200
         inputs:
         - destination: platform=iOS Simulator,name=iPhone 15,OS=17.5
-        - xcodebuild_options: '"-derivedDataPath" "/Users/vagrant/git/DerivedData"
-            "COMPILER_INDEX_STORE_ENABLE=NO" "CODE_SIGN_IDENTITY=" 
-            "CODE_SIGNING_REQUIRED=NO" "CODE_SIGNING_ALLOWED=NO"'
+        - 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}_iphonesimulator17.5-arm64.xctestrun"
     - [email protected]:
         run_if: '{{getenv "RUN_UI_TESTS" | eq "Run_UI_Tests"}}'
         inputs:
         - pipeline_intermediate_files: '$BITRISE_XCRESULT_PATH:BITRISE_UITESTS_${SHARD}_XCRESULT_PATH'
-  
   determine_apps_affected:
     steps:
     - [email protected]: {}
@@ -467,12 +463,12 @@ workflows:
     - script@1:
         inputs:
         - content: |-
-             #!/usr/bin/env bash
-             set -e
-             set -x
-             cd firefox-ios/Client.xcodeproj
-             sed -i '' 's/CODE_SIGN_IDENTITY = "iPhone Developer"/CODE_SIGN_IDENTITY = "iPhone Developer"/' project.pbxproj
-             cd -
+            #!/usr/bin/env bash
+            set -e
+            set -x
+            cd firefox-ios/Client.xcodeproj
+            sed -i '' 's/CODE_SIGN_IDENTITY = "iPhone Developer"/CODE_SIGN_IDENTITY = "iPhone Developer"/' project.pbxproj
+            cd -
         title: Set xcodeproj code_sign_identity to iPhone Developer
     - script@1:
         inputs:
@@ -609,7 +605,7 @@ workflows:
                 envman add --key RUN_UI_TESTS --value Run_UI_Tests
                 exit 0
             fi
-            
+
             # Match on file names in all directories and subdirectories
             #
             # Project Configs
@@ -762,6 +758,10 @@ workflows:
         - message: "The build run info: $BITRISE_GIT_MESSAGE"
         - webhook_url: "$WEBHOOK_SLACK_TOKEN"
     description: This Workflow is to build the app using latest xcode available in Bitrise
+    meta:
+      bitrise.io:
+        stack: osx-xcode-15.4.x
+        machine_type_id: g2-m1.8core
   L10nBuild:
     steps:
     - activate-ssh-key@4:
@@ -850,7 +850,8 @@ workflows:
         is_expand: false
       BITRISE_SCHEME: L10nSnapshotTest
     description: >-
-      This Workflow is to run L10n tests in one locale and then share the bundle with the rest of the builds
+      This Workflow is to run L10n tests in one locale and then share the bundle with
+      the rest of the builds
   L10nScreenshotsTests:
     steps:
     - activate-ssh-key@4:
@@ -1227,7 +1228,7 @@ workflows:
         - project_path: firefox-ios/Client.xcodeproj
         - scheme: Fennec
         - destination: platform=iOS Simulator,name=iPhone 15,OS=17.5
-        - test_plan: PerformanceTestPlan   
+        - test_plan: PerformanceTestPlan
     - [email protected]:
         is_always_run: true
         title: Create perfherder data object
@@ -1240,7 +1241,7 @@ workflows:
             set -x
             # get dependency
             cd ./test-fixtures && git clone https://github.com/isabelrios/xcresult_extract.git
-            
+
             echo $BITRISE_XCRESULT_PATH
             ls
             ls $BITRISE_XCRESULT_PATH
@@ -1329,7 +1330,7 @@ workflows:
                 --no-record-video \
                 --client-details=matrixLabel="Bitrise" \
                 --quiet 2>&1)
-            
+
             GCLOUD_EXITCODE=$? # this will get the right-most command from the gcloud subshell
             echo "GCLOUD_EXITCODE: $GCLOUD_EXITCODE"
 
@@ -1646,7 +1647,6 @@ workflows:
         - channel: "#mobile-alerts-ios"
         - message: "The build failed to build"
         - webhook_url: "$SLACK_WEBHOOK"
-  
   focus_ui_test:
     before_run:
     - focus-pull-and-unzip-dependencies
@@ -1698,7 +1698,6 @@ workflows:
         - channel: "#mobile-alerts-ios"
         - message: "The build run the Focus testPlan: $TEST_PLAN_NAME"
         - webhook_url: "$SLACK_WEBHOOK"
-  
   klar_unit_test:
     before_run:
     - focus-pull-and-unzip-dependencies
@@ -1754,7 +1753,7 @@ workflows:
         - channel: "#mobile-alerts-ios"
         - message: "The build run the Focus testPlan: UnitTests"
         - webhook_url: "$SLACK_WEBHOOK"
-  
+
   # # FOCUS UTILITIES WORKFLOWS
   focus-clone-and-build-dependencies:
     description: Clones the repo and builds dependencies
@@ -1771,7 +1770,7 @@ workflows:
         title: ContentBlockerGen
 
   focus-pull-and-unzip-dependencies:
-    description: Pulls and unzip the dependencies from previous stage 
+    description: Pulls and unzip the dependencies from previous stage
     steps:
     - pull-intermediate-files@1:
         inputs:

test-fixtures/update.py

@@ -21,12 +21,10 @@
 ]
 '''
 pattern = 'osx-xcode-'
-version_name = 'ventura'
-patterns = [pattern, version_name]
+patterns = [pattern]
 BITRISE_YML = 'bitrise.yml'
 WORKFLOW = 'NewXcodeVersions'
 
-
 resp = requests.get(BITRISE_STACK_INFO)
 resp.raise_for_status()
 resp_json = resp.json()
@@ -41,36 +39,26 @@ def parse_semver(raw_str):
         return False
 
 
-def available_stacks():
+def default_stack():
     try:
         resp = requests.get(BITRISE_STACK_INFO)
         resp_json = resp.json()
-        return resp_json['available_stacks']
+        return resp_json['project_types_with_default_stacks']['ios']['default_stack']
     except HTTPError as http_error:
         print('An HTTP error has occurred: {http_error}')
     except Exception as err:
         print('An exception has occurred: {err}')
 
-
-def largest_version():
-    stacks = available_stacks()
-    for item in stacks:
-        # only look at XCode versions that aren't in beta
-        if stacks[item]['beta-tag'] != '': continue
-        # use the first version in the list that matches both platform and version
-        if all([x in item for x in patterns]): 
-            return '{0}.x'.format('.'.join(item.split('.')[0:2]))
-
 if __name__ == '__main__':
     '''
     STEPS
-    1. check bitrise API stack info for latest XCode version
+    1. check bitrise API stack info for the default stack version
     2. compare latest with current bitrise.yml stack version in repo
     3. if same exit, if not, continue
     4. modify bitrise.yml (update stack value)
     '''
 
-    largest_semver = largest_version()
+    largest_semver = default_stack().split(pattern)[1]
     tmp_file = 'tmp.yml'
 
     with open(BITRISE_YML, 'r') as infile:
@@ -84,7 +72,7 @@ def largest_version():
         y = obj_yaml.load(infile)
 
         current_semver = y['workflows'][WORKFLOW]['meta']['bitrise.io']['stack']
-
+        
         # remove pattern prefix from current_semver to compare with largest
         current_semver = current_semver.split(pattern)[1]