Skip to content

Commit 84e30bd

Browse files
authored
Use Java 8 for building Android benchmark binaries (#752)
* Use Java 8 for building Android benchmark binaries * Update deprecated ubuntu images
1 parent 58fcade commit 84e30bd

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/release.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
key: ${{ runner.os }}-${{ hashFiles('**/third_party/install_android.sh') }}
3131
- name: Install pip dependencies
3232
run: pip install numpy six --no-cache-dir
33+
- name: Set Java version
34+
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
3335
- name: Download and install Android NDK/SDK
3436
if: steps.cache.outputs.cache-hit != 'true'
3537
run: ./third_party/install_android.sh
@@ -85,7 +87,7 @@ jobs:
8587
asset_content_type: application/octet-stream
8688

8789
android-aar:
88-
runs-on: ubuntu-18.04
90+
runs-on: ubuntu-latest
8991
steps:
9092
- uses: actions/checkout@v3
9193
with:
@@ -100,6 +102,8 @@ jobs:
100102
key: ${{ runner.os }}-${{ hashFiles('**/third_party/install_android.sh') }}
101103
- name: Install pip dependencies
102104
run: pip install numpy six --no-cache-dir
105+
- name: Set Java version
106+
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
103107
- name: Download and install Android NDK/SDK
104108
if: steps.cache.outputs.cache-hit != 'true'
105109
run: ./third_party/install_android.sh
@@ -214,7 +218,7 @@ jobs:
214218

215219
manylinux-release-wheel:
216220
name: Build release wheels for manylinux2014
217-
runs-on: ubuntu-18.04
221+
runs-on: ubuntu-latest
218222
strategy:
219223
matrix:
220224
python-version: [3.7, 3.8, 3.9, "3.10"]

.github/workflows/unittests.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
run: PYTHONPATH=./ python larq_compute_engine/mlir/python/converter_test.py
114114

115115
Android_AAR:
116-
runs-on: ubuntu-18.04
116+
runs-on: ubuntu-latest
117117
if: "!contains(github.event.head_commit.message, 'ci-skip')"
118118

119119
steps:
@@ -130,6 +130,8 @@ jobs:
130130
key: ${{ runner.os }}-${{ hashFiles('**/third_party/install_android.sh') }}
131131
- name: Install pip dependencies
132132
run: pip install numpy six --no-cache-dir
133+
- name: Set Java version
134+
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
133135
- name: Download and install Android NDK/SDK
134136
if: steps.cache.outputs.cache-hit != 'true'
135137
run: ./third_party/install_android.sh

0 commit comments

Comments
 (0)