Skip to content

Commit 7041a14

Browse files
committed
Merge branch 'main' of github.com:opendocument-app/OpenDocument.droid into ci-cache-test-vm
2 parents 8cceb94 + 4151664 commit 7041a14

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/workflows/android_main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717

1818
jobs:
1919
build:
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121
steps:
2222
- name: checkout
2323
uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
3939
run: pip install conan
4040

4141
- name: install ndk
42-
run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"
42+
run: yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"
4343

4444
- name: conan remote
4545
run: |
@@ -71,7 +71,7 @@ jobs:
7171
if-no-files-found: error
7272

7373
test:
74-
runs-on: ubuntu-22.04
74+
runs-on: ubuntu-24.04
7575
needs: build
7676
strategy:
7777
fail-fast: false
@@ -110,7 +110,7 @@ jobs:
110110
run: pip install conan
111111

112112
- name: install ndk
113-
run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"
113+
run: yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"
114114

115115
- name: conan remote
116116
run: |

0 commit comments

Comments
 (0)