Skip to content

Commit d8a9e4b

Browse files
abueideabueide
committed
ci fixes
1 parent 85aec3a commit d8a9e4b

22 files changed

Lines changed: 1925 additions & 136 deletions

File tree

‎.flox/env/manifest.lock‎

Lines changed: 411 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.flox/env/manifest.toml‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,21 @@
11
version = 1
22

33
[install]
4-
54
[vars]
65
[hook]
7-
on-activate = '''
8-
set -euo pipefail
9-
project_root="${PROJECT_ROOT:-$(git rev-parse --show-toplevel 2>/dev/null || pwd)}"
10-
if [ ! -d "$project_root/env" ]; then
11-
project_root="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/../../../../.." && pwd)"
12-
fi
13-
export PROJECT_ROOT="$project_root"
14-
export ROOT_PROJECT="$project_root"
15-
if [ -f "$project_root/env/android/android-common/setup.sh" ]; then
16-
source "$project_root/env/android/android-common/setup.sh"
17-
fi
18-
if [ -f "$project_root/scripts/ios.sh" ]; then
19-
source "$project_root/scripts/ios.sh"
20-
fi
21-
22-
'''
236
[profile]
7+
[services]
248

259
[include]
26-
environments = [
27-
{ dir = "env/common", name = "common" },
28-
{ dir = "env/nodejs", name = "nodejs" },
29-
{ dir = "env/android/min", name = "android-min" },
30-
{ dir = "env/android/max", name = "android-max" },
31-
{ dir = "env/ios/min", name = "ios-min" },
32-
{ dir = "env/ios/max", name = "ios-max" }
33-
]
34-
10+
environments = [
11+
{ dir = "env/common", name = "common" },
12+
{ dir = "env/nodejs", name = "nodejs" },
13+
{ dir = "env/android/min", name = "android-min" },
14+
{ dir = "env/android/max", name = "android-max" },
15+
{ dir = "env/ios", name = "ios" },
16+
{ dir = "env/ios/min", name = "ios-min" },
17+
{ dir = "env/ios/max", name = "ios-max" }
18+
]
3519

3620
[build]
3721
[build.analytics-react-native]

‎.github/workflows/ci-e2e-nightly.yml‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ jobs:
2323
ios-device: "iPhone 13"
2424
ios-runtime: "15.0"
2525
simulator-service: ios-simulator-min
26-
xcode-version: "26.1.1"
26+
xcode-version: "16.1"
27+
env-dir: env/ios/min
2728
device-target: "ios-min"
2829
- name: ios-max
2930
ios-device: "iPhone 17"
3031
ios-runtime: "26.1"
3132
simulator-service: ios-simulator-max
3233
xcode-version: "26.1.1"
34+
env-dir: env/ios/max
3335
device-target: "ios-max"
3436
steps:
3537
- uses: actions/checkout@v4
@@ -89,14 +91,16 @@ jobs:
8991
uses: flox/[email protected]
9092
- name: Prepare iOS runtime (no boot)
9193
run: |
92-
env_dir="env/ios/max"
93-
if [ "${{ matrix.name }}" = "ios-min" ]; then env_dir="env/ios/min"; fi
94-
flox activate -d "$env_dir" -- bash -lc 'IOS_PREPARE_ONLY=1 IOS_DOWNLOAD_RUNTIME=1 scripts/ios.sh start'
94+
env_dir="${{ matrix.env-dir }}"
95+
flox activate -d "$env_dir" -- bash -lc 'IOS_DOWNLOAD_RUNTIME=1 bash scripts/devices.sh setup ios'
96+
- name: iOS E2E Build
97+
run: |
98+
env_dir="${{ matrix.env-dir }}"
99+
flox activate -d "$env_dir" -- bash -lc "yarn --cwd examples/E2E build:ios"
95100
- name: iOS E2E Tests
96101
run: |
97-
env_dir="env/ios/max"
98-
if [ "${{ matrix.name }}" = "ios-min" ]; then env_dir="env/ios/min"; fi
99-
flox activate -d "$env_dir" -- bash -lc "yarn e2e:ios"
102+
env_dir="${{ matrix.env-dir }}"
103+
flox activate -d "$env_dir" -- bash -lc "yarn --cwd examples/E2E test:ios"
100104
101105
run-e2e-android:
102106
continue-on-error: true
@@ -105,15 +109,15 @@ jobs:
105109
matrix:
106110
include:
107111
- name: android-min
108-
avd-name: pixel_API21_x86_64
109-
system-image: "system-images;android-21;google_apis;x86_64"
110112
emulator-service: android-emulator-min
113+
env-dir: env/android/min
111114
device-target: "android-min"
115+
avd-flavor: "minsdk"
112116
- name: android-max
113-
avd-name: medium_phone_API33_x86_64
114-
system-image: "system-images;android-33;google_apis;x86_64"
115117
emulator-service: android-emulator-max
118+
env-dir: env/android/max
116119
device-target: "android-max"
120+
avd-flavor: "max"
117121
steps:
118122
- uses: actions/checkout@v4
119123
- name: Resolve platform targets
@@ -140,11 +144,13 @@ jobs:
140144
uses: flox/[email protected]
141145
- name: Prepare Android image (no boot)
142146
run: |
143-
env_dir="env/android/max"
144-
if [ "${{ matrix.name }}" = "android-min" ]; then env_dir="env/android/min"; fi
145-
flox activate -d "$env_dir" -- bash -lc 'AVD_PREPARE_ONLY=1 scripts/android.sh start'
147+
env_dir="${{ matrix.env-dir }}"
148+
flox activate -d "$env_dir" -- bash -lc 'AVD_FLAVOR=${{ matrix.avd-flavor }} bash scripts/devices.sh setup android'
149+
- name: Android E2E Build
150+
run: |
151+
env_dir="${{ matrix.env-dir }}"
152+
flox activate -d "$env_dir" -- bash -lc "set -euo pipefail; AVD_FLAVOR=${{ matrix.avd-flavor }} yarn --cwd examples/E2E build:android"
146153
- name: Android E2E Tests
147154
run: |
148-
env_dir="env/android/max"
149-
if [ "${{ matrix.name }}" = "android-min" ]; then env_dir="env/android/min"; fi
150-
flox activate -d "$env_dir" -- bash -lc "set -euo pipefail; yarn e2e:android"
155+
env_dir="${{ matrix.env-dir }}"
156+
flox activate -d "$env_dir" -- bash -lc "set -euo pipefail; AVD_FLAVOR=${{ matrix.avd-flavor }} yarn --cwd examples/E2E test:android"

‎.github/workflows/ci-e2e-optional.yml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
ios-runtime: "26.1"
3434
simulator-service: ios-simulator-max
3535
xcode-version: "26.1.1"
36+
env-dir: env/ios/max
3637
device-target: "ios-max"
3738
steps:
3839
- uses: actions/checkout@v4
@@ -90,10 +91,13 @@ jobs:
9091
uses: flox/[email protected]
9192
- name: Prepare iOS runtime (no boot)
9293
run: |
93-
flox activate -d env/ios/max -- bash -lc 'IOS_PREPARE_ONLY=1 IOS_DOWNLOAD_RUNTIME=1 scripts/ios.sh start'
94+
flox activate -d "${{ matrix.env-dir }}" -- bash -lc 'IOS_DOWNLOAD_RUNTIME=1 bash scripts/devices.sh setup ios'
95+
- name: iOS E2E Build
96+
run: |
97+
flox activate -d "${{ matrix.env-dir }}" -- bash -lc "yarn --cwd examples/E2E build:ios"
9498
- name: iOS E2E Tests
9599
run: |
96-
flox activate -d env/ios/max -- bash -lc "yarn e2e:ios"
100+
flox activate -d "${{ matrix.env-dir }}" -- bash -lc "yarn --cwd examples/E2E test:ios"
97101
98102
run-e2e-android:
99103
if: (github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run-e2e') || github.event_name == 'push') && (github.event.inputs.platforms == 'all' || github.event.inputs.platforms == '' || github.event.inputs.platforms == 'android' || github.event.inputs.platforms == null)
@@ -103,9 +107,9 @@ jobs:
103107
matrix:
104108
include:
105109
- name: android-max
106-
avd-name: medium_phone_API33_x86_64
107-
system-image: "system-images;android-33;google_apis;x86_64"
108110
emulator-service: android-emulator-max
111+
env-dir: env/android/max
112+
avd-flavor: "max"
109113
device-target: "android-max"
110114
steps:
111115
- uses: actions/checkout@v4
@@ -131,7 +135,10 @@ jobs:
131135
uses: flox/[email protected]
132136
- name: Prepare Android image (no boot)
133137
run: |
134-
flox activate -d env/android/max -- bash -lc 'AVD_PREPARE_ONLY=1 scripts/android.sh start'
138+
flox activate -d "${{ matrix.env-dir }}" -- bash -lc 'AVD_FLAVOR=${{ matrix.avd-flavor }} bash scripts/devices.sh setup android'
139+
- name: Android E2E Build
140+
run: |
141+
flox activate -d "${{ matrix.env-dir }}" -- bash -lc "set -euo pipefail; AVD_FLAVOR=${{ matrix.avd-flavor }} yarn --cwd examples/E2E build:android"
135142
- name: Android E2E Tests
136143
run: |
137-
flox activate -d env/android/max -- bash -lc "set -euo pipefail; yarn e2e:android"
144+
flox activate -d "${{ matrix.env-dir }}" -- bash -lc "set -euo pipefail; AVD_FLAVOR=${{ matrix.avd-flavor }} yarn --cwd examples/E2E test:android"

‎env/android/android-common/.flox/env/manifest.lock‎

Lines changed: 146 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎env/android/android-common/.flox/env/manifest.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ ANDROID_EMULATOR_HEADLESS_FLAGS = "-no-window -no-audio -gpu swiftshader_indirec
1919
project_root="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/../../../../.." && pwd)"
2020
fi
2121
export PROJECT_ROOT="$project_root"
22+
export ANDROID_SDK_FLAVOR="${AVD_FLAVOR:-${ANDROID_TARGET:-max}}"
23+
export ANDROID_FLAVOR_SOURCED=1
2224
source "$project_root/env/android/android-common/setup.sh"
2325
'''
2426
[profile]

0 commit comments

Comments
 (0)