Skip to content

Commit 2bfe2e0

Browse files
committed
cleanup
1 parent 8cbab71 commit 2bfe2e0

6 files changed

Lines changed: 18 additions & 44 deletions

File tree

.flox/env/manifest.lock

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

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,9 @@ jobs:
5050
xcode-version: ${{ matrix.xcode-version }}
5151
- name: Install flox
5252
uses: flox/install-flox-action@v2.2.0
53-
- name: Yarn debug (iOS env)
54-
run: |
55-
CLEAN_PATH=$(printf "%s" "$PATH" | tr ':' '\n' | grep -v '/.yarn/bin' | awk '!seen[$0]++' | paste -sd ':' -)
56-
PATH="$CLEAN_PATH" flox activate -d env/ios/latest -- bash -lc '
57-
echo PATH=$PATH
58-
ls -l /Users/runner/.local/bin || true
59-
command -v yarn
60-
yarn --version
61-
node -v
62-
command -v corepack && corepack --version
63-
'
6453
- name: iOS E2E Tests
6554
run: |
66-
CLEAN_PATH=$(printf "%s" "$PATH" | tr ':' '\n' | grep -v '/.yarn/bin' | awk '!seen[$0]++' | paste -sd ':' -)
67-
PATH="$CLEAN_PATH" flox activate -d env/ios/latest -- bash -lc '
68-
yarn e2e:ios
69-
'
55+
flox activate -d env/ios/latest -- bash -lc "yarn e2e:ios"
7056
7157
run-e2e-android:
7258
continue-on-error: true
@@ -90,6 +76,8 @@ jobs:
9076
uses: jlumbroso/free-disk-space@v1.3.1
9177
- name: Install flox
9278
uses: flox/install-flox-action@v2.2.0
79+
- name: Start Android emulator
80+
run: flox services start ${{ matrix.emulator-service }}
9381
- name: Android E2E Tests
9482
run: |
95-
flox activate -d env/android/latest -- bash -lc "yarn e2e:android"
83+
flox activate -d env/android/latest -- bash -lc "set -euo pipefail; yarn e2e:android"

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,9 @@ jobs:
5353
xcode-version: ${{ matrix.xcode-version }}
5454
- name: Install flox
5555
uses: flox/install-flox-action@v2.2.0
56-
- name: Yarn debug (iOS env)
57-
run: |
58-
CLEAN_PATH=$(printf "%s" "$PATH" | tr ':' '\n' | grep -v '/.yarn/bin' | awk '!seen[$0]++' | paste -sd ':' -)
59-
PATH="$CLEAN_PATH" flox activate -d env/ios/latest -- bash -lc '
60-
echo PATH=$PATH
61-
ls -l /Users/runner/.local/bin || true
62-
command -v yarn
63-
yarn --version
64-
node -v
65-
command -v corepack && corepack --version
66-
'
6756
- name: iOS E2E Tests
6857
run: |
69-
CLEAN_PATH=$(printf "%s" "$PATH" | tr ':' '\n' | grep -v '/.yarn/bin' | awk '!seen[$0]++' | paste -sd ':' -)
70-
PATH="$CLEAN_PATH" flox activate -d env/ios/latest -- bash -lc '
71-
yarn e2e:ios
72-
'
58+
flox activate -d env/ios/latest -- bash -lc "yarn e2e:ios"
7359
7460
run-e2e-android:
7561
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)
@@ -89,6 +75,8 @@ jobs:
8975
uses: jlumbroso/free-disk-space@v1.3.1
9076
- name: Install flox
9177
uses: flox/install-flox-action@v2.2.0
78+
- name: Start Android emulator
79+
run: flox services start ${{ matrix.emulator-service }}
9280
- name: Android E2E Tests
9381
run: |
94-
flox activate -d env/android/latest -- bash -lc "yarn e2e:android"
82+
flox activate -d env/android/latest -- bash -lc "set -euo pipefail; yarn e2e:android"

env/nodejs/.flox/env/manifest.lock

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

env/nodejs/.flox/env/manifest.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ yarn.version = "4.12.0"
1010
[vars]
1111

1212
[hook]
13-
on-activate = '''
14-
yarn
15-
'''
13+
on-activate = ''
1614

1715

1816
[profile]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,5 @@
8383
"ts-jest": "^29.1.1",
8484
"typescript": "^5.2.2"
8585
},
86-
"packageManager": "yarn@4.1.0"
86+
"packageManager": "yarn@4.12.0"
8787
}

0 commit comments

Comments
 (0)