From b5802e552e31786b1555ba277d759a3116f5431e Mon Sep 17 00:00:00 2001 From: Adam Horodyski Date: Mon, 14 Apr 2025 09:57:30 +0200 Subject: [PATCH 1/3] fix: avoid failing fast on the matrix --- .github/workflows/remote-build-android.yml | 1 + .github/workflows/remote-build-ios.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/remote-build-android.yml b/.github/workflows/remote-build-android.yml index 988cf070cf00..e038597e6cff 100644 --- a/.github/workflows/remote-build-android.yml +++ b/.github/workflows/remote-build-android.yml @@ -12,6 +12,7 @@ jobs: build: runs-on: ubuntu-latest-xl strategy: + fail-fast: false matrix: include: - project_root: ./ diff --git a/.github/workflows/remote-build-ios.yml b/.github/workflows/remote-build-ios.yml index 0157ec660a0c..b76eddc70192 100644 --- a/.github/workflows/remote-build-ios.yml +++ b/.github/workflows/remote-build-ios.yml @@ -12,6 +12,7 @@ jobs: build: runs-on: macos-15-xlarge strategy: + fail-fast: false matrix: include: - project_root: ./ From 35d700a2908e336941a5d309a3b461ae00c86e1d Mon Sep 17 00:00:00 2001 From: Adam Horodyski Date: Mon, 14 Apr 2025 15:35:16 +0200 Subject: [PATCH 2/3] fix: parametrize node setup for hybrid/nd --- .github/workflows/remote-build-android.yml | 2 ++ .github/workflows/remote-build-ios.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/remote-build-android.yml b/.github/workflows/remote-build-android.yml index e038597e6cff..a26dd3fccc32 100644 --- a/.github/workflows/remote-build-android.yml +++ b/.github/workflows/remote-build-android.yml @@ -30,6 +30,8 @@ jobs: - name: Setup Node uses: ./.github/actions/composite/setupNode + with: + IS_HYBRID_BUILD: ${{ matrix.project_root == 'Mobile-Expensify/' && 'true' || 'false' }} - name: RNEF Remote Build - Android uses: callstackincubator/android@a49920aadab9f41951944ea52bb7983fa6b20b03 diff --git a/.github/workflows/remote-build-ios.yml b/.github/workflows/remote-build-ios.yml index b76eddc70192..330bf632686b 100644 --- a/.github/workflows/remote-build-ios.yml +++ b/.github/workflows/remote-build-ios.yml @@ -32,6 +32,8 @@ jobs: - name: Setup Node uses: ./.github/actions/composite/setupNode + with: + IS_HYBRID_BUILD: ${{ matrix.project_root == 'Mobile-Expensify/' && 'true' || 'false' }} - name: RNEF Remote Build - iOS uses: callstackincubator/ios@4c2dcc0d6b9c35407cf294e17386b65258a3b6af From 6ec4f07240e5a1b3a9cb803b12b3fe23a2dcc85e Mon Sep 17 00:00:00 2001 From: Adam Horodyski Date: Mon, 14 Apr 2025 16:20:28 +0200 Subject: [PATCH 3/3] fix: only fetch with submodules for hybrid builds --- .github/workflows/remote-build-android.yml | 5 +++-- .github/workflows/remote-build-ios.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/remote-build-android.yml b/.github/workflows/remote-build-android.yml index a26dd3fccc32..676ecb55380a 100644 --- a/.github/workflows/remote-build-android.yml +++ b/.github/workflows/remote-build-android.yml @@ -19,19 +19,20 @@ jobs: variant: 'developmentDebug' - project_root: Mobile-Expensify/ + is_hybrid_build: true variant: 'Debug' steps: - name: Checkout # v4 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 with: - submodules: true + submodules: ${{ matrix.is_hybrid_build || false }} token: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Setup Node uses: ./.github/actions/composite/setupNode with: - IS_HYBRID_BUILD: ${{ matrix.project_root == 'Mobile-Expensify/' && 'true' || 'false' }} + IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }} - name: RNEF Remote Build - Android uses: callstackincubator/android@a49920aadab9f41951944ea52bb7983fa6b20b03 diff --git a/.github/workflows/remote-build-ios.yml b/.github/workflows/remote-build-ios.yml index 330bf632686b..e2f8d5047983 100644 --- a/.github/workflows/remote-build-ios.yml +++ b/.github/workflows/remote-build-ios.yml @@ -20,6 +20,7 @@ jobs: configuration: 'DebugDevelopment' - project_root: Mobile-Expensify/ + is_hybrid_build: true scheme: 'Expensify Dev' configuration: 'Debug' steps: @@ -27,13 +28,13 @@ jobs: # v4 uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 with: - submodules: true + submodules: ${{ matrix.is_hybrid_build || false }} token: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Setup Node uses: ./.github/actions/composite/setupNode with: - IS_HYBRID_BUILD: ${{ matrix.project_root == 'Mobile-Expensify/' && 'true' || 'false' }} + IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }} - name: RNEF Remote Build - iOS uses: callstackincubator/ios@4c2dcc0d6b9c35407cf294e17386b65258a3b6af