update workflows

esaulpaugh · Aug 4, 2024 · 2aee354 · 2aee354
1 parent fac310c
commit 2aee354
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/aarch64.yml b/.github/workflows/aarch64.yml
@@ -1,4 +1,4 @@
-name: Java CI gradle aarch64
+name: Java CI Maven aarch64
 
 on: [push, pull_request]
 
@@ -7,29 +7,33 @@ jobs:
 
     strategy:
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04 ]
-        version: [ '22.0.2' ]
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
 
     runs-on: ${{ matrix.os }}
-    container: arm64v8/ubuntu:latest
 
     steps:
       - uses: actions/checkout@v4
 
-      - uses: gradle/actions/wrapper-validation@v3
+      - name: Set up QEMU
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu binfmt-support qemu-user-static
+          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
+      - name: Build in ARM64 container
+        run: |
+          docker run --rm -v ${{ github.workspace }}:/workspace -w /workspace arm64v8/ubuntu:latest \
+          /bin/bash -c "apt-get update && apt-get install -y openjdk-11-jdk && java -version"
 
-      - name: Set up JDK 17 aarch64
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: ${{ matrix.version }}
-          java-package: jdk
+          java-version: '11'
           architecture: aarch64
-          cache: 'gradle'
 
-      - name: Build with Gradle
+      - name: Build with Maven
         run: |
           java -version
-          chmod +x ./gradlew
-          ./gradlew build fatJar --no-daemon
-          java -jar build/libs/headlong-cli-1.1-SNAPSHOT.jar -version
+          mvn -B package --file pom.xml
+          java -jar target/headlong-cli-1.1-SNAPSHOT.jar -version
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -8,7 +8,6 @@ jobs:
     strategy:
       matrix:
         os: [ macos-12, macos-13, macos-14, ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-2019, windows-2022 ]
-        version: [ '8.0.422' ]
 
     runs-on: ${{ matrix.os }}
 
@@ -21,7 +20,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'liberica'
-          java-version: ${{ matrix.version }}
+          java-version: '8.0.422'
           java-package: jdk
           architecture: x64
           cache: 'gradle'

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -8,7 +8,6 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04, ubuntu-24.04, windows-2019, windows-2022 ]
-        version: [ '8' ]
 
     runs-on: ${{ matrix.os }}
 
@@ -19,7 +18,7 @@ jobs:
         uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018
         with:
           distribution: 'dragonwell'
-          java-version: ${{ matrix.version }}
+          java-version: '8'
           java-package: jdk
           architecture: x64
           cache: 'maven'