diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml index c64232df8..257614448 100644 --- a/.github/workflows/e2e-ios.yml +++ b/.github/workflows/e2e-ios.yml @@ -2,7 +2,7 @@ name: E2E iOS on: pull_request: paths: - - .github/workflows/ios-e2e.yml + - .github/workflows/e2e-ios.yml - apps/common/example/** - apple/** - src/** @@ -15,14 +15,14 @@ on: jobs: test: - runs-on: macos-14 + runs-on: macos-latest timeout-minutes: 60 strategy: matrix: working-directory: [paper-example] fail-fast: false env: - DEVICE: iPhone 15 Pro + DEVICE: iPhone 17 Pro steps: - name: Checkout Git repository uses: actions/checkout@v4 @@ -30,7 +30,7 @@ jobs: - name: Use latest stable Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '16.1' + xcode-version: '16.4' - name: Get react-native-svg node_modules cache uses: actions/cache@v4 diff --git a/.github/workflows/ios-build-test.yml b/.github/workflows/ios-build-test.yml index 2b7972784..977b84fcb 100644 --- a/.github/workflows/ios-build-test.yml +++ b/.github/workflows/ios-build-test.yml @@ -18,11 +18,13 @@ on: jobs: build: - runs-on: macos-14 + runs-on: macos-latest strategy: matrix: working-directory: [paper-example, fabric-example] fail-fast: false + env: + DEVICE: iPhone 17 Pro concurrency: group: ios-${{ matrix.working-directory }}-${{ github.ref }} cancel-in-progress: true @@ -33,7 +35,7 @@ jobs: - name: Use latest stable Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '16.1' + xcode-version: '16.4' - name: Get react-native-svg node_modules cache uses: actions/cache@v4 @@ -92,4 +94,4 @@ jobs: - name: Build app working-directory: apps/${{ matrix.working-directory }} - run: npx react-native run-ios --simulator="iPhone 15 Pro" --mode Debug --verbose --no-packager + run: npx react-native run-ios --simulator="${{ env.DEVICE }}" --mode Debug --verbose --no-packager diff --git a/.github/workflows/macos-build-test.yml b/.github/workflows/macos-build-test.yml index 2ee542a7f..05a16645d 100644 --- a/.github/workflows/macos-build-test.yml +++ b/.github/workflows/macos-build-test.yml @@ -18,7 +18,7 @@ on: jobs: build: if: github.repository == 'software-mansion/react-native-svg' - runs-on: macos-14 + runs-on: macos-latest strategy: matrix: working-directory: [paper-macos-example, fabric-macos-example] @@ -33,7 +33,7 @@ jobs: - name: Use latest stable Xcode uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: latest-stable + xcode-version: '16.4' - name: Get react-native-svg node_modules cache uses: actions/cache@v4 diff --git a/apps/fabric-macos-example/Gemfile.lock b/apps/fabric-macos-example/Gemfile.lock index 7e969f8a0..3873bdcca 100644 --- a/apps/fabric-macos-example/Gemfile.lock +++ b/apps/fabric-macos-example/Gemfile.lock @@ -117,4 +117,4 @@ RUBY VERSION ruby 2.7.6p219 BUNDLED WITH - 2.2.3 + 2.7.2 diff --git a/apps/paper-example/Gemfile b/apps/paper-example/Gemfile index 1ddcc8fab..60770b186 100644 --- a/apps/paper-example/Gemfile +++ b/apps/paper-example/Gemfile @@ -13,4 +13,4 @@ gem 'concurrent-ruby', '< 1.3.4' gem 'bigdecimal' gem 'logger' gem 'benchmark' -gem 'mutex_m' \ No newline at end of file +gem 'mutex_m' diff --git a/apps/paper-macos-example/Gemfile b/apps/paper-macos-example/Gemfile index 8d72c37a8..96b4d2923 100644 --- a/apps/paper-macos-example/Gemfile +++ b/apps/paper-macos-example/Gemfile @@ -7,3 +7,7 @@ ruby ">= 2.6.10" # bound in the template on Cocoapods with next React Native release. gem 'cocoapods', '>= 1.13', '< 1.15' gem 'activesupport', '>= 6.1.7.5', '< 7.1.0' +gem "bigdecimal" +gem "logger" +gem "benchmark" +gem "mutex_m" diff --git a/apps/paper-macos-example/Gemfile.lock b/apps/paper-macos-example/Gemfile.lock index e4ba34087..82d32aa25 100644 --- a/apps/paper-macos-example/Gemfile.lock +++ b/apps/paper-macos-example/Gemfile.lock @@ -17,6 +17,8 @@ GEM json (>= 1.5.1) atomos (0.1.3) base64 (0.2.0) + benchmark (0.4.1) + bigdecimal (3.2.3) claide (1.1.0) cocoapods (1.14.3) addressable (~> 2.8) @@ -68,8 +70,10 @@ GEM i18n (1.14.5) concurrent-ruby (~> 1.0) json (2.7.2) + logger (1.7.0) minitest (5.24.1) molinillo (0.8.0) + mutex_m (0.3.0) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) @@ -96,10 +100,14 @@ PLATFORMS DEPENDENCIES activesupport (>= 6.1.7.5, < 7.1.0) + benchmark + bigdecimal cocoapods (>= 1.13, < 1.15) + logger + mutex_m RUBY VERSION ruby 2.7.2p137 BUNDLED WITH - 2.5.22 + 2.7.2