Skip to content

Commit b6b12a6

Browse files
Merge branch 'bumble-tech:1.x' into rxjava3
2 parents 57769a8 + 917963a commit b6b12a6

File tree

5 files changed

+17
-32
lines changed

5 files changed

+17
-32
lines changed

.github/workflows/build_1.x.yml

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
distribution: 'zulu'
2424
java-version: '17'
25-
- uses: gradle/wrapper-validation-action@v2
25+
- uses: gradle/actions/wrapper-validation@v3
2626
- uses: gradle/actions/setup-gradle@v3
2727
with:
2828
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
@@ -66,7 +66,7 @@ jobs:
6666
category: detekt
6767
- name: Upload failure artifacts
6868
if: failure()
69-
uses: actions/upload-artifact@v3
69+
uses: actions/upload-artifact@v4
7070
with:
7171
name: reports
7272
path: |
@@ -88,34 +88,19 @@ jobs:
8888
with:
8989
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
9090
- name: Pre build sources before launching emulator
91-
run: ./gradlew compileDebugAndroidTestSources
92-
- name: AVD cache
93-
uses: actions/cache@v4
94-
id: avd-cache
95-
with:
96-
path: |
97-
~/.android/avd/*
98-
~/.android/adb*
99-
key: avd-28
100-
- name: Create AVD and generate snapshot for caching
101-
if: steps.avd-cache.outputs.cache-hit != 'true'
102-
uses: reactivecircus/android-emulator-runner@v2
103-
with:
104-
# Use API 29 https://github.com/ReactiveCircus/android-emulator-runner/issues/222
105-
# Use API 28 https://github.com/ReactiveCircus/android-emulator-runner/issues/373
106-
api-level: 28
107-
arch: x86_64
108-
force-avd-creation: false
109-
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
110-
disable-animations: false
111-
script: echo "Generated AVD snapshot for caching."
91+
run: ./gradlew assembleAndroidTest
92+
- name: Enable KVM
93+
run: |
94+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
95+
sudo udevadm control --reload-rules
96+
sudo udevadm trigger --name-match=kvm
97+
# Do not cache the emulator because it causes https://github.com/ReactiveCircus/android-emulator-runner/issues/385
11298
- name: Instrumentation tests
11399
uses: reactivecircus/android-emulator-runner@v2
114100
with:
115101
# Use API 29 https://github.com/ReactiveCircus/android-emulator-runner/issues/222
116102
# Use API 28 https://github.com/ReactiveCircus/android-emulator-runner/issues/373
117103
api-level: 28
118-
arch: x86_64
119104
force-avd-creation: false
120105
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
121106
disable-animations: true
@@ -125,7 +110,7 @@ jobs:
125110
./gradlew connectedCheck
126111
- name: Upload failed instrumentation artifacts
127112
if: failure()
128-
uses: actions/upload-artifact@v3
113+
uses: actions/upload-artifact@v4
129114
with:
130115
name: instrumentation-failures
131116
path: |

.github/workflows/build_2.x.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
distribution: 'zulu'
2424
java-version: '17'
25-
- uses: gradle/wrapper-validation-action@v2
25+
- uses: gradle/actions/wrapper-validation@v3
2626
- uses: gradle/actions/setup-gradle@v3
2727
with:
2828
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
@@ -75,7 +75,7 @@ jobs:
7575
with:
7676
distribution: 'zulu'
7777
java-version: '17'
78-
- uses: gradle/wrapper-validation-action@v2
78+
- uses: gradle/actions/wrapper-validation@v3
7979
- uses: gradle/actions/setup-gradle@v3
8080
with:
8181
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
@@ -99,7 +99,7 @@ jobs:
9999
with:
100100
distribution: 'zulu'
101101
java-version: '17'
102-
- uses: gradle/wrapper-validation-action@v2
102+
- uses: gradle/actions/wrapper-validation@v3
103103
- uses: gradle/actions/setup-gradle@v3
104104
with:
105105
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
@@ -137,7 +137,7 @@ jobs:
137137
with:
138138
distribution: 'zulu'
139139
java-version: '17'
140-
- uses: gradle/wrapper-validation-action@v2
140+
- uses: gradle/actions/wrapper-validation@v3
141141
- uses: gradle/actions/setup-gradle@v3
142142
with:
143143
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}

.github/workflows/check_documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: gradle/wrapper-validation-action@v2
2020
- uses: gradle/actions/setup-gradle@v3
2121
with:
22-
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
22+
cache-read-only: true
2323
- name: Generate distributions
2424
run: ./gradlew wasmJsBrowserDistributionMkdocs --continue
2525
- uses: actions/setup-python@v5

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: gradle/wrapper-validation-action@v2
2323
- uses: gradle/actions/setup-gradle@v3
2424
with:
25-
cache-read-only: ${{ env.MAIN_BRANCH != 'true' }}
25+
cache-read-only: true
2626
- run: pip install mkdocs-material
2727
- run: pip install mkdocs-macros-plugin
2828
- run: pip install mkdocs-redirects

.github/workflows/post_merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Build
2424
run: ./gradlew :samples:app:assembleRelease
2525
- name: Upload sample app apk
26-
uses: actions/upload-artifact@v3
26+
uses: actions/upload-artifact@v4
2727
with:
2828
name: sample-app
2929
path: samples/app/build/outputs/apk/release/app-release.apk

0 commit comments

Comments
 (0)