From e2ea60180e8ee05f2889c427994ee92846503a81 Mon Sep 17 00:00:00 2001 From: Joe Lauer Date: Wed, 1 Nov 2023 20:35:27 -0400 Subject: [PATCH] Update github workflows --- .github/workflows/java21.yaml | 18 ++++++++++++++++++ .github/workflows/linux-arm64.yaml | 2 +- .github/workflows/linux-armel.yaml | 2 +- .github/workflows/linux-armhf.yaml | 2 +- .github/workflows/linux-musl-arm64.yaml | 2 +- .github/workflows/linux-musl-x64.yaml | 2 +- .github/workflows/linux-riscv64.yaml | 2 +- .github/workflows/macos-x64.yaml | 2 +- README.md | 1 + 9 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/java21.yaml diff --git a/.github/workflows/java21.yaml b/.github/workflows/java21.yaml new file mode 100644 index 0000000..eedcd50 --- /dev/null +++ b/.github/workflows/java21.yaml @@ -0,0 +1,18 @@ +name: Java 21 +on: + - push + - workflow_dispatch +jobs: + build: + runs-on: ubuntu-latest + timeout-minutes: 40 + steps: + - uses: actions/checkout@v3 + - name: Set up Azul JDK 21 + uses: actions/setup-java@v3 + with: + java-version: 21 + distribution: 'zulu' + cache: 'maven' + - name: Test in Maven + run: mvn test \ No newline at end of file diff --git a/.github/workflows/linux-arm64.yaml b/.github/workflows/linux-arm64.yaml index cd4a426..1d65f1a 100644 --- a/.github/workflows/linux-arm64.yaml +++ b/.github/workflows/linux-arm64.yaml @@ -17,7 +17,7 @@ jobs: with: arch: none distro: none - base_image: fizzed/buildx:arm64v8-ubuntu18-jdk11 + base_image: fizzed/buildx:arm64-ubuntu18-jdk11 dockerRunArgs: | --volume "~/.m2:/root/.m2" --volume "${PWD}:/mnt" run: | diff --git a/.github/workflows/linux-armel.yaml b/.github/workflows/linux-armel.yaml index 0b4c16c..2bdeaa3 100644 --- a/.github/workflows/linux-armel.yaml +++ b/.github/workflows/linux-armel.yaml @@ -17,7 +17,7 @@ jobs: with: arch: none distro: none - base_image: fizzed/buildx:arm32v5-debian11-jdk11 + base_image: fizzed/buildx:armel-debian11-jdk11 dockerRunArgs: | --volume "~/.m2:/root/.m2" --volume "${PWD}:/mnt" run: | diff --git a/.github/workflows/linux-armhf.yaml b/.github/workflows/linux-armhf.yaml index 831b10c..ab14a38 100644 --- a/.github/workflows/linux-armhf.yaml +++ b/.github/workflows/linux-armhf.yaml @@ -17,7 +17,7 @@ jobs: with: arch: none distro: none - base_image: fizzed/buildx:arm32v7-ubuntu18-jdk11 + base_image: fizzed/buildx:armhf-ubuntu18-jdk11 dockerRunArgs: | --volume "~/.m2:/root/.m2" --volume "${PWD}:/mnt" run: | diff --git a/.github/workflows/linux-musl-arm64.yaml b/.github/workflows/linux-musl-arm64.yaml index eb8bcb7..7d758ec 100644 --- a/.github/workflows/linux-musl-arm64.yaml +++ b/.github/workflows/linux-musl-arm64.yaml @@ -17,7 +17,7 @@ jobs: with: arch: none distro: none - base_image: fizzed/buildx:arm64v8-alpine3.11-jdk11 + base_image: fizzed/buildx:arm64-alpine3.11-jdk11 shell: /bin/sh dockerRunArgs: | --volume "~/.m2:/root/.m2" --volume "${PWD}:/mnt" diff --git a/.github/workflows/linux-musl-x64.yaml b/.github/workflows/linux-musl-x64.yaml index 2d346df..45c3bd9 100644 --- a/.github/workflows/linux-musl-x64.yaml +++ b/.github/workflows/linux-musl-x64.yaml @@ -17,7 +17,7 @@ jobs: with: arch: none distro: none - base_image: fizzed/buildx:amd64-alpine3.11-jdk11 + base_image: fizzed/buildx:x64-alpine3.11-jdk11 shell: /bin/sh dockerRunArgs: | --volume "~/.m2:/root/.m2" --volume "${PWD}:/mnt" diff --git a/.github/workflows/linux-riscv64.yaml b/.github/workflows/linux-riscv64.yaml index db752d5..2b23ecb 100644 --- a/.github/workflows/linux-riscv64.yaml +++ b/.github/workflows/linux-riscv64.yaml @@ -17,7 +17,7 @@ jobs: with: arch: none distro: none - base_image: fizzed/buildx:riscv64-ubuntu20-jdk19 + base_image: fizzed/buildx:riscv64-ubuntu20-jdk21 dockerRunArgs: | --volume "~/.m2:/root/.m2" --volume "${PWD}:/mnt" run: | diff --git a/.github/workflows/macos-x64.yaml b/.github/workflows/macos-x64.yaml index 9c9a6de..d917d21 100644 --- a/.github/workflows/macos-x64.yaml +++ b/.github/workflows/macos-x64.yaml @@ -4,7 +4,7 @@ on: - workflow_dispatch jobs: build: - runs-on: macos-11 + runs-on: macos-latest timeout-minutes: 40 steps: - uses: actions/checkout@v3 diff --git a/README.md b/README.md index 9ea76ff..dfa83be 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Java distribution of Tkrzw & JNI libs by Fizzed [![Java 8](https://img.shields.io/github/actions/workflow/status/fizzed/tkrzw/java8.yaml?branch=master&label=Java%208&style=flat-square)](https://github.com/fizzed/tkrzw/actions/workflows/java8.yaml) [![Java 11](https://img.shields.io/github/actions/workflow/status/fizzed/tkrzw/java11.yaml?branch=master&label=Java%2011&style=flat-square)](https://github.com/fizzed/tkrzw/actions/workflows/java11.yaml) [![Java 17](https://img.shields.io/github/actions/workflow/status/fizzed/tkrzw/java17.yaml?branch=master&label=Java%2017&style=flat-square)](https://github.com/fizzed/tkrzw/actions/workflows/java17.yaml) +[![Java 21](https://img.shields.io/github/actions/workflow/status/fizzed/tkrzw/java21.yaml?branch=master&label=Java%2021&style=flat-square)](https://github.com/fizzed/tkrzw/actions/workflows/java21.yaml) [![Linux x64](https://img.shields.io/github/actions/workflow/status/fizzed/tkrzw/java11.yaml?branch=master&label=Linux%20x64&style=flat-square)](https://github.com/fizzed/tkrzw/actions/workflows/java11.yaml) [![Linux arm64](https://img.shields.io/github/actions/workflow/status/fizzed/tkrzw/linux-arm64.yaml?branch=master&label=Linux%20arm64&style=flat-square)](https://github.com/fizzed/tkrzw/actions/workflows/linux-arm64.yaml)