From b09415b7ce1b7a5f90eb240cd00f3216bc35ed81 Mon Sep 17 00:00:00 2001 From: Alex Guretzki Date: Fri, 22 Dec 2023 10:54:30 +0100 Subject: [PATCH] reverting changes --- .github/workflows/pr_scan.yml | 15 +++------------ .github/workflows/test-SPM-integration.yml | 4 ++-- .github/workflows/test-carthage-integration.yml | 4 ++-- .github/workflows/test_cocoapods_integration.yml | 4 ++-- .github/workflows/test_library_evolution.yml | 4 ++-- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.github/workflows/pr_scan.yml b/.github/workflows/pr_scan.yml index 7b0c0778dc..7e3468f7f7 100644 --- a/.github/workflows/pr_scan.yml +++ b/.github/workflows/pr_scan.yml @@ -13,9 +13,7 @@ jobs: build: env: sonarToken: ${{ secrets.SONAR_TOKEN }} - device: 'iPhone-14' - runtime: 'iOS-17-0' - runs-on: macos-13-xl # Apple Silicon Runner + runs-on: macos-13-xlarge # Apple Silicon Runner steps: - uses: actions/checkout@v4 @@ -41,22 +39,15 @@ jobs: run: | Scripts/validate-Adyen-SDK-version.sh - - name: Pre-heat iPhone Simulator ${{ env.device }} ${{ env.runtime }} - id: sets-simulator - run: | - simulator_name=$(uuidgen) - simulator_id=$(xcrun simctl create $simulator_name com.apple.CoreSimulator.SimDeviceType.${{ env.device }} com.apple.CoreSimulator.SimRuntime.${{ env.runtime }}) - xcrun simctl boot $simulator_id - echo "id=$simulator_id" >> "$GITHUB_OUTPUT" - - name: Clean Build and Test run: | xcodebuild -version - xcodebuild clean build test -project "${project}" -scheme "${scheme}" ${params} -destination "id=${{ steps.sets-simulator.outputs.id }}" | xcpretty --utf --color && exit ${PIPESTATUS[0]} + xcodebuild clean build test -project "${project}" -scheme "${scheme}" ${params} -destination "${destination}" | xcpretty --utf --color && exit ${PIPESTATUS[0]} env: project: 'Adyen.xcodeproj' params: '-derivedDataPath ./DerivedData -enableCodeCoverage YES -skipPackagePluginValidation' scheme: 'AdyenUIHost' + destination: 'name=iPhone 14,OS=17.0.1' - name: Code Coverage run: | diff --git a/.github/workflows/test-SPM-integration.yml b/.github/workflows/test-SPM-integration.yml index 6ee9bb3992..05372e7b20 100644 --- a/.github/workflows/test-SPM-integration.yml +++ b/.github/workflows/test-SPM-integration.yml @@ -1,8 +1,8 @@ name: Test Swift Package Manager Integration on: -# pull_request: -# types: [opened, synchronize, reopened] + pull_request: + types: [opened, synchronize, reopened] push: branches: diff --git a/.github/workflows/test-carthage-integration.yml b/.github/workflows/test-carthage-integration.yml index 520c45b21f..f5f663f4e2 100644 --- a/.github/workflows/test-carthage-integration.yml +++ b/.github/workflows/test-carthage-integration.yml @@ -1,8 +1,8 @@ name: Test Carthage Integration on: -# pull_request: -# types: [opened, synchronize, reopened] + pull_request: + types: [opened, synchronize, reopened] push: branches: diff --git a/.github/workflows/test_cocoapods_integration.yml b/.github/workflows/test_cocoapods_integration.yml index cbdf6fc69b..976c7795d4 100644 --- a/.github/workflows/test_cocoapods_integration.yml +++ b/.github/workflows/test_cocoapods_integration.yml @@ -1,8 +1,8 @@ name: Test Cocoapods Integration on: -# pull_request: -# types: [opened, synchronize, reopened] + pull_request: + types: [opened, synchronize, reopened] push: branches: diff --git a/.github/workflows/test_library_evolution.yml b/.github/workflows/test_library_evolution.yml index 8b8a6c9187..ece40c02e0 100644 --- a/.github/workflows/test_library_evolution.yml +++ b/.github/workflows/test_library_evolution.yml @@ -1,8 +1,8 @@ name: 📚 Library Evolution Compatibility on: -# pull_request: -# types: [opened, synchronize, reopened] + pull_request: + types: [opened, synchronize, reopened] push: branches: