Skip to content

Commit 0a2138b

Browse files
authored
Merge branch 'master' into feat/t10s
2 parents 8806d5b + 1d036ca commit 0a2138b

3 files changed

Lines changed: 57 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches: [ "master" ]
66
pull_request:
7+
types: [ opened, synchronize, reopened, ready_for_review ]
78

89
workflow_dispatch:
910

.github/workflows/e2e.yml

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ on:
88
required: false
99
default: "default-feature-branch"
1010
pull_request:
11+
paths:
12+
- 'app/**'
13+
- 'gradle/**'
14+
- '*.gradle.kts'
15+
- 'gradle.properties'
16+
- '.github/workflows/e2e.yml'
1117

1218
env:
1319
TERM: xterm-256color
@@ -104,6 +110,28 @@ jobs:
104110
sudo udevadm control --reload-rules
105111
sudo udevadm trigger --name-match=kvm
106112
113+
- name: AVD cache
114+
uses: actions/cache@v4
115+
id: avd-cache
116+
with:
117+
path: |
118+
~/.android/avd/*
119+
~/.android/adb*
120+
key: avd-33-x86_64-pixel_6
121+
122+
- name: Create AVD and generate snapshot for caching
123+
if: steps.avd-cache.outputs.cache-hit != 'true'
124+
uses: reactivecircus/android-emulator-runner@v2
125+
with:
126+
profile: pixel_6
127+
api-level: 33
128+
arch: x86_64
129+
avd-name: Pixel_6
130+
force-avd-creation: false
131+
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-front none
132+
disable-animations: false
133+
script: echo "Generated AVD snapshot for caching."
134+
107135
- name: Download APK
108136
uses: actions/download-artifact@v4
109137
with:
@@ -156,7 +184,7 @@ jobs:
156184
arch: x86_64
157185
avd-name: Pixel_6
158186
force-avd-creation: false
159-
emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-front none
187+
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-front none
160188
script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "${{ matrix.shard.grep }}"
161189
env:
162190
RECORD_VIDEO: true
@@ -173,7 +201,7 @@ jobs:
173201
arch: x86_64
174202
avd-name: Pixel_6
175203
force-avd-creation: false
176-
emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-front none
204+
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-front none
177205
script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "${{ matrix.shard.grep }}"
178206
env:
179207
RECORD_VIDEO: true
@@ -189,7 +217,7 @@ jobs:
189217
arch: x86_64
190218
avd-name: Pixel_6
191219
force-avd-creation: false
192-
emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-front none
220+
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-front none
193221
script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "${{ matrix.shard.grep }}"
194222
env:
195223
RECORD_VIDEO: true

.github/workflows/e2e_migration.yml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,28 @@ jobs:
108108
sudo udevadm control --reload-rules
109109
sudo udevadm trigger --name-match=kvm
110110
111+
- name: AVD cache
112+
uses: actions/cache@v4
113+
id: avd-cache
114+
with:
115+
path: |
116+
~/.android/avd/*
117+
~/.android/adb*
118+
key: avd-33-x86_64-pixel_6
119+
120+
- name: Create AVD and generate snapshot for caching
121+
if: steps.avd-cache.outputs.cache-hit != 'true'
122+
uses: reactivecircus/android-emulator-runner@v2
123+
with:
124+
profile: pixel_6
125+
api-level: 33
126+
arch: x86_64
127+
avd-name: Pixel_6
128+
force-avd-creation: false
129+
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-front none
130+
disable-animations: false
131+
script: echo "Generated AVD snapshot for caching."
132+
111133
- name: Download APK
112134
uses: actions/download-artifact@v4
113135
with:
@@ -149,7 +171,7 @@ jobs:
149171
arch: x86_64
150172
avd-name: Pixel_6
151173
force-avd-creation: false
152-
emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-front none
174+
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-front none
153175
script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "${{ matrix.scenario.grep }}"
154176
env:
155177
BACKEND: regtest
@@ -167,7 +189,7 @@ jobs:
167189
arch: x86_64
168190
avd-name: Pixel_6
169191
force-avd-creation: false
170-
emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-front none
192+
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-front none
171193
script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "${{ matrix.scenario.grep }}"
172194
env:
173195
BACKEND: regtest
@@ -184,7 +206,7 @@ jobs:
184206
arch: x86_64
185207
avd-name: Pixel_6
186208
force-avd-creation: false
187-
emulator-options: -no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim -camera-front none
209+
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-front none
188210
script: cd bitkit-e2e-tests && ./ci_run_android.sh --mochaOpts.grep "${{ matrix.scenario.grep }}"
189211
env:
190212
BACKEND: regtest

0 commit comments

Comments
 (0)