From d22243ff44c60f3fae863bb604cd78a3be8afa51 Mon Sep 17 00:00:00 2001 From: SingularityKChen Date: Thu, 19 Oct 2023 17:26:56 +0800 Subject: [PATCH] ci: sync Dockerfile and GitHub Action + use Java 17 by GraalVM 22.3.3 --- .devcontainer/Dockerfile | 6 +++--- .github/workflows/push.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 48c896f..ce1e030 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -9,9 +9,9 @@ RUN pacman -Syu --noconfirm vim which # Install GraalVM Ref: https://github.com/chipsalliance/chisel/blob/86b2a7d3f7807ca0d1d8a725bd87ee4be1f61007/.devcontainer/Dockerfile#L32-L40 # This downloads all relevant GraalVM architectures at once, mostly because $TARGETARCH values don't map exactly to the release URLs. Since we're optimizing for developer experience here and not image size, this is OK # GraalVM release links can be found here: https://github.com/graalvm/graalvm-ce-builds/releases -ENV JAVA_VERSION=java11 -#ADD https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-$JAVA_VERSION-linux-aarch64-22.3.1.tar.gz /graalvm/tarballs/arm64.tar.gz -ADD https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.1/graalvm-ce-$JAVA_VERSION-linux-amd64-22.3.1.tar.gz /graalvm/tarballs/amd64.tar.gz +ENV JAVA_VERSION=java17 +#ADD https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/graalvm-ce-$JAVA_VERSION-linux-aarch64-22.3.3.tar.gz /graalvm/tarballs/arm64.tar.gz +ADD https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/graalvm-ce-$JAVA_VERSION-linux-amd64-22.3.3.tar.gz /graalvm/tarballs/amd64.tar.gz #RUN tar -xzf /graalvm/tarballs/$TARGETARCH.tar.gz -C /graalvm --strip-components=1 RUN tar -xzf /graalvm/tarballs/amd64.tar.gz -C /graalvm --strip-components=1 ENV JAVA_HOME=/graalvm diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 5bb5268..20507fd 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v4 - uses: graalvm/setup-graalvm@v1 with: - version: '22.3.1' # GraalVM version + version: '22.3.3' # GraalVM version java-version: '17' distribution: 'graalvm-community' - name: Install dependencies