From 7b69406226b7043fb82eb4ff5775df6ca4163c58 Mon Sep 17 00:00:00 2001 From: bohdanprog Date: Fri, 27 Sep 2024 16:12:33 +0200 Subject: [PATCH 1/8] chore: update iOS workflows --- .github/workflows/ios-build-test.yml | 2 +- .github/workflows/ios-e2e.yml | 4 ++-- .github/workflows/macos-build-test-fabric.yml | 2 +- .github/workflows/macos-build-test-paper.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ios-build-test.yml b/.github/workflows/ios-build-test.yml index eb117f191..ec2b4ca28 100644 --- a/.github/workflows/ios-build-test.yml +++ b/.github/workflows/ios-build-test.yml @@ -66,7 +66,7 @@ jobs: - name: Install Pods working-directory: ${{ matrix.working-directory }}/ios - run: pod install + run: bundle install && bundle exec pod install - name: Restore build artifacts from cache uses: actions/cache@v3 diff --git a/.github/workflows/ios-e2e.yml b/.github/workflows/ios-e2e.yml index 61cc6f24a..a0a05fd46 100644 --- a/.github/workflows/ios-e2e.yml +++ b/.github/workflows/ios-e2e.yml @@ -19,7 +19,7 @@ jobs: timeout-minutes: 60 env: WORKING_DIRECTORY: example - DEVICE: iPhone 14 Pro + DEVICE: iPhone 16 Pro XCODE_VERSION: latest-stable concurrency: group: ios-e2e-example-${{ github.ref }} @@ -66,7 +66,7 @@ jobs: - name: Install Pods working-directory: ${{ env.WORKING_DIRECTORY }}/ios - run: pod install + run: bundle install && bundle exec pod install - name: Restore build artifacts from cache uses: actions/cache@v3 diff --git a/.github/workflows/macos-build-test-fabric.yml b/.github/workflows/macos-build-test-fabric.yml index 07b3108e3..97d26b1a9 100644 --- a/.github/workflows/macos-build-test-fabric.yml +++ b/.github/workflows/macos-build-test-fabric.yml @@ -60,7 +60,7 @@ jobs: - name: Install Pods working-directory: ${{ matrix.working-directory }}/macos - run: RCT_NEW_ARCH_ENABLED=1 pod install + run: bundle install && RCT_NEW_ARCH_ENABLED=1 bundle exec pod install - name: Restore build artifacts from cache uses: actions/cache@v3 diff --git a/.github/workflows/macos-build-test-paper.yml b/.github/workflows/macos-build-test-paper.yml index f2fdbb2a7..1d28ca84f 100644 --- a/.github/workflows/macos-build-test-paper.yml +++ b/.github/workflows/macos-build-test-paper.yml @@ -60,7 +60,7 @@ jobs: - name: Install Pods working-directory: ${{ matrix.working-directory }}/macos - run: pod install + run: bundle install && bundle exec pod install - name: Restore build artifacts from cache uses: actions/cache@v3 From cbe56defe816e54bd5f41a7fc9631c42e9f051f5 Mon Sep 17 00:00:00 2001 From: bohdanprog Date: Mon, 30 Sep 2024 08:15:30 +0200 Subject: [PATCH 2/8] chore: update iOS workflows --- .github/workflows/ios-build-test.yml | 2 +- .github/workflows/macos-build-test-fabric.yml | 4 ++-- .github/workflows/macos-build-test-paper.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ios-build-test.yml b/.github/workflows/ios-build-test.yml index ec2b4ca28..fe4604bdd 100644 --- a/.github/workflows/ios-build-test.yml +++ b/.github/workflows/ios-build-test.yml @@ -76,4 +76,4 @@ jobs: - name: Build app working-directory: ${{ matrix.working-directory }} - run: npx react-native@latest run-ios --simulator="iPhone 14 Pro" --mode Debug --verbose --terminal /bin/zsh + run: npx react-native@latest run-ios --simulator="iPhone 16 Pro" --mode Debug --verbose --terminal /bin/zsh diff --git a/.github/workflows/macos-build-test-fabric.yml b/.github/workflows/macos-build-test-fabric.yml index 97d26b1a9..5551bc301 100644 --- a/.github/workflows/macos-build-test-fabric.yml +++ b/.github/workflows/macos-build-test-fabric.yml @@ -36,7 +36,7 @@ jobs: restore-keys: ${{ runner.os }}-node-modules-svg- - name: Install react-native-svg node_modules - run: yarn install + run: yarn install --frozen-lockfile - name: Restore app node_modules from cache uses: actions/cache@v3 @@ -47,7 +47,7 @@ jobs: - name: Install app node_modules working-directory: ${{ matrix.working-directory }} - run: yarn install + run: yarn install --frozen-lockfile - name: Restore Pods from cache uses: actions/cache@v3 diff --git a/.github/workflows/macos-build-test-paper.yml b/.github/workflows/macos-build-test-paper.yml index 1d28ca84f..486a88277 100644 --- a/.github/workflows/macos-build-test-paper.yml +++ b/.github/workflows/macos-build-test-paper.yml @@ -36,7 +36,7 @@ jobs: restore-keys: ${{ runner.os }}-node-modules-svg- - name: Install react-native-svg node_modules - run: yarn install + run: yarn install --frozen-lockfile - name: Restore app node_modules from cache uses: actions/cache@v3 @@ -47,7 +47,7 @@ jobs: - name: Install app node_modules working-directory: ${{ matrix.working-directory }} - run: yarn install + run: yarn install --frozen-lockfile - name: Restore Pods from cache uses: actions/cache@v3 From 06e7ef83a7c3f1c0da89036bc445c1c6dc2d203c Mon Sep 17 00:00:00 2001 From: bohdanprog Date: Mon, 30 Sep 2024 14:52:05 +0200 Subject: [PATCH 3/8] chore: remove check for branch in macos workflow --- .github/workflows/macos-build-test-fabric.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/macos-build-test-fabric.yml b/.github/workflows/macos-build-test-fabric.yml index 5551bc301..bb3c5102a 100644 --- a/.github/workflows/macos-build-test-fabric.yml +++ b/.github/workflows/macos-build-test-fabric.yml @@ -15,7 +15,6 @@ on: jobs: build: - if: github.repository == 'software-mansion/react-native-svg' runs-on: macos-14 strategy: matrix: From 8ce443fdefb1f1803411661f42769fa3346470a6 Mon Sep 17 00:00:00 2001 From: bohdanprog Date: Mon, 30 Sep 2024 14:54:08 +0200 Subject: [PATCH 4/8] chore: restore check for branch --- .github/workflows/macos-build-test-fabric.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos-build-test-fabric.yml b/.github/workflows/macos-build-test-fabric.yml index bb3c5102a..5551bc301 100644 --- a/.github/workflows/macos-build-test-fabric.yml +++ b/.github/workflows/macos-build-test-fabric.yml @@ -15,6 +15,7 @@ on: jobs: build: + if: github.repository == 'software-mansion/react-native-svg' runs-on: macos-14 strategy: matrix: From 4f17973928c2796c1d7b49a6e029020e138cc590 Mon Sep 17 00:00:00 2001 From: bohdanprog Date: Mon, 30 Sep 2024 14:54:35 +0200 Subject: [PATCH 5/8] chore: remove check for branch --- .github/workflows/macos-build-test-fabric.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/macos-build-test-fabric.yml b/.github/workflows/macos-build-test-fabric.yml index 5551bc301..ef25f4fa1 100644 --- a/.github/workflows/macos-build-test-fabric.yml +++ b/.github/workflows/macos-build-test-fabric.yml @@ -9,9 +9,6 @@ on: - macos-example/macos/** - src/fabric/** - package.json - push: - branches: - - main jobs: build: From 502f8c2cbfda279837e491b95e8e7f85d04a8031 Mon Sep 17 00:00:00 2001 From: bohdanprog Date: Mon, 30 Sep 2024 14:55:25 +0200 Subject: [PATCH 6/8] chore: restore branch check --- .github/workflows/macos-build-test-fabric.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-build-test-fabric.yml b/.github/workflows/macos-build-test-fabric.yml index ef25f4fa1..5551bc301 100644 --- a/.github/workflows/macos-build-test-fabric.yml +++ b/.github/workflows/macos-build-test-fabric.yml @@ -9,6 +9,9 @@ on: - macos-example/macos/** - src/fabric/** - package.json + push: + branches: + - main jobs: build: From 050dd1db5a915b613c3b51f3dc5846dffc478c6b Mon Sep 17 00:00:00 2001 From: bohdanprog Date: Wed, 2 Oct 2024 21:58:19 +0200 Subject: [PATCH 7/8] chore: add manual trigger for ios-e2e --- .github/workflows/ios-e2e.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ios-e2e.yml b/.github/workflows/ios-e2e.yml index a0a05fd46..511817cdc 100644 --- a/.github/workflows/ios-e2e.yml +++ b/.github/workflows/ios-e2e.yml @@ -1,5 +1,25 @@ name: Test iOS e2e on: + workflow_dispatch: + inputs: + logLevel: + description: 'Log level' + required: true + default: 'warning' + type: choice + options: + - info + - warning + - debug + tags: + description: 'Test scenario tags' + required: false + type: boolean + environment: + description: 'Environment to run tests against' + type: environment + required: true + pull_request: paths: - '.github/workflows/android-e2e-test.yml' @@ -12,7 +32,7 @@ on: push: branches: - main - workflow_dispatch: + jobs: test: runs-on: macos-14 From c5cc596252958d540c4dad225f9f6493e049113c Mon Sep 17 00:00:00 2001 From: bohdanprog Date: Wed, 2 Oct 2024 22:00:47 +0200 Subject: [PATCH 8/8] chore: update manual trigger for ios-e2e --- .github/workflows/ios-e2e.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.github/workflows/ios-e2e.yml b/.github/workflows/ios-e2e.yml index 511817cdc..a0a05fd46 100644 --- a/.github/workflows/ios-e2e.yml +++ b/.github/workflows/ios-e2e.yml @@ -1,25 +1,5 @@ name: Test iOS e2e on: - workflow_dispatch: - inputs: - logLevel: - description: 'Log level' - required: true - default: 'warning' - type: choice - options: - - info - - warning - - debug - tags: - description: 'Test scenario tags' - required: false - type: boolean - environment: - description: 'Environment to run tests against' - type: environment - required: true - pull_request: paths: - '.github/workflows/android-e2e-test.yml' @@ -32,7 +12,7 @@ on: push: branches: - main - + workflow_dispatch: jobs: test: runs-on: macos-14