Dual testing

.github/workflows/base_ut.yaml

@@ -10,6 +10,10 @@ on:
       destination:
         required: true
         type: string
+      scheme:
+        description: The Xcode scheme to build and test
+        required: true
+        type: string
 
 jobs:
   test:
@@ -26,42 +30,20 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Install xcbeautify
+        run: brew install xcbeautify
+
       - name: Build iOS and Test
-        uses: sersoft-gmbh/xcodebuild-action@v3
+        uses: nick-fields/retry@v3
         with:
-          action: test
-          build-settings: ONLY_ACTIVE_ARCH=NO
-          configuration: Debug
-          derived-data-path: "${{github.workspace}}/SplitApp"
-          destination: ${{ inputs.destination }}
-          project: Split.xcodeproj
-          scheme: Split
-          output-formatter: 'xcbeautify'
-          sdk: 'iphonesimulator'
-          test-plan: ${{ inputs.test-plan }}
-
-      # - name: Install java 11
-      #   uses: actions/setup-java@v3
-      #   with:
-      #     distribution: 'oracle'
-      #     java-version: '17'
-
-      # - name: SonarQube Install
-      #   uses: mathrix-education/sonar-scanner@master
-      #   env:
-      #     ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-      #   with:
-      #     version: 4.8.0.2856
-      #     scan: false
-
-      # - name: SonarQube Scan
-      #   run: >
-      #     sonar-scanner --debug
-      #     -Dsonar.login=${{ secrets.SONARQUBE_TOKEN }}
-      #     -Dsonar.host.url=${{ secrets.SONARQUBE_HOST }} 
-      #     -Dsonar.projectName=${{ github.event.repository.name }} 
-      #     -Dsonar.projectKey=splitio_ios-client 
-      #     -Dsonar.github.token=${{ secrets.GITHUB_TOKEN }} 
-      #     -Dsonar.c.file.suffixes=- 
-      #     -Dsonar.cpp.file.suffixes=- 
-      #     -Dsonar.objc.file.suffixes=-
+          timeout_minutes: 30
+          max_attempts: 3
+          command: |
+            set -o pipefail
+            xcodebuild test \
+              -project Split.xcodeproj \
+              -scheme ${{ inputs.scheme }} \
+              -destination '${{ inputs.destination }}' \
+              -testPlan ${{ inputs.test-plan }} \
+              -sdk iphonesimulator \
+              ONLY_ACTIVE_ARCH=NO | xcbeautify

.github/workflows/sonar.yml

@@ -134,7 +134,7 @@ jobs:
           head -n 20 sonarqube-generic-coverage.xml
 
       - name: Run SonarQube scan
-        uses: sonarsource/sonarqube-scan-action@v5
+        uses: sonarsource/sonarqube-scan-action@v6
         with:
           projectBaseDir: .
           args: >

.github/workflows/test_all.yaml

@@ -32,8 +32,10 @@ jobs:
           SplitPushManagerUT,
           SplitStreamingUT
         ]
+        scheme: [SplitTestsSwift5, SplitTestsSwift6]
       fail-fast: false
     uses: ./.github/workflows/base_ut.yaml
     with:
       test-plan: ${{ matrix.plan }}
       destination: 'platform=iOS Simulator,name=iPhone 16,OS=latest'
+      scheme: ${{ matrix.scheme }}