Skip to content

Commit 2119bc9

Browse files
authored
Update runner os versions (#357)
1 parent 413b706 commit 2119bc9

1 file changed

Lines changed: 14 additions & 16 deletions

File tree

.github/workflows/android_main.yml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env:
2424

2525
jobs:
2626
build:
27-
runs-on: ubuntu-20.04
27+
runs-on: ubuntu-22.04
2828
steps:
2929
- name: checkout
3030
uses: actions/checkout@v4
@@ -38,13 +38,12 @@ jobs:
3838
distribution: 'zulu'
3939
java-version: 17
4040

41-
- name: setup python 3.8
41+
- name: setup python 3.12
4242
uses: actions/setup-python@v5
4343
with:
44-
python-version: 3.8
45-
46-
- name: install pip and conan
47-
run: python -m pip install --upgrade pip conan
44+
python-version: 3.12
45+
- name: install python dependencies
46+
run: pip install conan
4847

4948
- name: install ndk
5049
run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"
@@ -78,7 +77,7 @@ jobs:
7877
if-no-files-found: error
7978

8079
test:
81-
runs-on: macos-11
80+
runs-on: macos-14
8281
strategy:
8382
fail-fast: false
8483
# Make sure the matrix here and in cache_AVD_images.yml is the same
@@ -107,20 +106,19 @@ jobs:
107106

108107
- name: install brew
109108
run: ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null
110-
- name: fix ninja install
111-
run: rm /usr/local/bin/2to3
112109
- name: install ninja
113110
run: brew install ninja
114-
# https://stackoverflow.com/a/57758679/198996
115111
- name: install bundler
116-
run: gem install bundler:1.17.3
112+
run: gem install bundler
117113
- name: install fastlane
118114
run: bundle install
119115

120-
- name: install pip
121-
run: python3 -m ensurepip
122-
- name: install conan
123-
run: pip3 install --upgrade conan
116+
- name: setup python 3.12
117+
uses: actions/setup-python@v5
118+
with:
119+
python-version: 3.12
120+
- name: install python dependencies
121+
run: pip install conan
124122

125123
- name: conan remote
126124
run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
@@ -137,7 +135,7 @@ jobs:
137135
path: |
138136
~/.android/avd/*
139137
~/.android/adb*
140-
key: avd-${{ matrix.arch }}-${{ matrix.api-level }}-r3
138+
key: avd-${{ matrix.arch }}-${{ matrix.api-level }}-r4
141139

142140
- name: Create AVD and generate snapshot for caching
143141
if: steps.avd-cache.outputs.cache-hit != 'true'

0 commit comments

Comments
 (0)