Skip to content

Commit 9d515df

Browse files
committed
fix: implement docker compose cli, use direct homebrew instalation instead of broken third-paty, add retry logic
1 parent 27ae87e commit 9d515df

File tree

4 files changed

+44
-23
lines changed

4 files changed

+44
-23
lines changed

.github/workflows/e2e-android.yml

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ jobs:
111111
- name: Kill java processes
112112
run: pkill -9 -f java || true
113113

114-
- name: run tests
114+
- name: Run tests attempt 1
115+
id: attempt1
116+
continue-on-error: true
115117
uses: reactivecircus/android-emulator-runner@v2
116118
with:
117119
avd-name: Pixel_API_31_AOSP
@@ -122,7 +124,37 @@ jobs:
122124
arch: x86_64
123125
disable-animations: true
124126
working-directory: example
125-
script: yarn e2e:test:android-release --record-videos all --take-screenshots all --record-logs all --artifacts-location /mnt/artifacts || yarn e2e:test:android-release --record-videos all --take-screenshots all --record-logs all --artifacts-location /mnt/artifactsyarn e2e:test:android-release --record-videos all --take-screenshots all --record-logs all --artifacts-location /mnt/artifacts || yarn e2e:test:android-release --record-videos all --take-screenshots all --record-logs all --artifacts-location /mnt/artifacts
127+
script: yarn e2e:test:android-release --timeout 200000 --record-videos all --take-screenshots all --record-logs all --artifacts-location /mnt/artifacts
128+
129+
- name: Run tests attempt 2
130+
if: steps.attempt1.outcome != 'success'
131+
id: attempt2
132+
continue-on-error: true
133+
uses: reactivecircus/android-emulator-runner@v2
134+
with:
135+
avd-name: Pixel_API_31_AOSP
136+
profile: 5.4in FWVGA
137+
api-level: 31
138+
force-avd-creation: false
139+
emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-back none -camera-front none -partition-size 2047
140+
arch: x86_64
141+
disable-animations: true
142+
working-directory: example
143+
script: yarn e2e:test:android-release --timeout 200000 --record-videos all --take-screenshots all --record-logs all --artifacts-location /mnt/artifacts
144+
145+
- name: Run tests attempt 3 (final)
146+
if: steps.attempt2.outcome != 'success'
147+
uses: reactivecircus/android-emulator-runner@v2
148+
with:
149+
avd-name: Pixel_API_31_AOSP
150+
profile: 5.4in FWVGA
151+
api-level: 31
152+
force-avd-creation: false
153+
emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-back none -camera-front none -partition-size 2047
154+
arch: x86_64
155+
disable-animations: true
156+
working-directory: example
157+
script: yarn e2e:test:android-release --timeout 200000 --record-videos all --take-screenshots all --record-logs all --artifacts-location /mnt/artifacts
126158

127159
- uses: actions/upload-artifact@v4
128160
if: failure()

.github/workflows/e2e-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
working-directory: example
5252
run: |
5353
gem update cocoapods xcodeproj
54-
pod install --project-directory=ios
54+
pod install --project-directory=ios || (pod repo update && pod install --project-directory=ios --clean-install)
5555
5656
- name: Install applesimutils
5757
run: |

.github/workflows/mocha-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
mkdir lnd
7474
mkdir clightning
7575
chmod 777 lnd clightning
76-
docker-compose up -d --quiet-pull
76+
docker compose up -d --quiet-pull
7777
7878
- name: Wait for electrum server
7979
timeout-minutes: 2

.github/workflows/mocha-ios.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,12 @@ jobs:
2222
with:
2323
fetch-depth: 1
2424

25-
- name: Setup Docker Colima 1
26-
uses: douglascamata/[email protected]
27-
28-
id: docker1
29-
continue-on-error: true
30-
with:
31-
lima: v0.18.0
32-
colima: v0.5.6
33-
34-
- name: Setup Docker Colima 2
35-
if: steps.docker1.outcome != 'success'
36-
uses: douglascamata/[email protected]
37-
38-
id: docker2
39-
with:
40-
lima: v0.18.0
41-
colima: v0.5.6
25+
- name: Setup Docker Colima
26+
run: |
27+
brew install docker docker-compose colima
28+
mkdir -p ~/.docker/cli-plugins
29+
ln -sfn /opt/homebrew/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose || true
30+
colima start --cpu 4 --memory 8 --disk 100
4231
4332
- name: Install backup-server dependencies
4433
working-directory: backup-server
@@ -50,7 +39,7 @@ jobs:
5039
mkdir lnd
5140
mkdir clightning
5241
chmod 777 lnd clightning
53-
docker-compose up -d --quiet-pull
42+
docker compose up -d --quiet-pull
5443
5544
- name: Wait for electrum server
5645
timeout-minutes: 2
@@ -85,7 +74,7 @@ jobs:
8574
working-directory: example
8675
run: |
8776
gem update cocoapods xcodeproj
88-
pod install --project-directory=ios
77+
pod install --project-directory=ios || (pod repo update && pod install --project-directory=ios --clean-install)
8978
9079
- name: Install applesimutils
9180
run: |

0 commit comments

Comments
 (0)