Use Java 8 for building Android benchmark binaries (#752)

* Use Java 8 for building Android benchmark binaries * Update deprecated ubuntu images
larq · Aug 25, 2022 · 84e30bd · 84e30bd
1 parent 58fcade
commit 84e30bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,6 +30,8 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/third_party/install_android.sh') }}
       - name: Install pip dependencies
         run: pip install numpy six --no-cache-dir
+      - name: Set Java version
+        run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
       - name: Download and install Android NDK/SDK
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./third_party/install_android.sh
@@ -85,7 +87,7 @@ jobs:
           asset_content_type: application/octet-stream
 
   android-aar:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
@@ -100,6 +102,8 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/third_party/install_android.sh') }}
       - name: Install pip dependencies
         run: pip install numpy six --no-cache-dir
+      - name: Set Java version
+        run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
       - name: Download and install Android NDK/SDK
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./third_party/install_android.sh
@@ -214,7 +218,7 @@ jobs:
 
   manylinux-release-wheel:
     name: Build release wheels for manylinux2014
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: [3.7, 3.8, 3.9, "3.10"]

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -113,7 +113,7 @@ jobs:
         run: PYTHONPATH=./ python larq_compute_engine/mlir/python/converter_test.py
 
   Android_AAR:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'ci-skip')"
 
     steps:
@@ -130,6 +130,8 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/third_party/install_android.sh') }}
       - name: Install pip dependencies
         run: pip install numpy six --no-cache-dir
+      - name: Set Java version
+        run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
       - name: Download and install Android NDK/SDK
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./third_party/install_android.sh