diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2f07dd76..c7d6bb59 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -20,10 +20,9 @@ RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/l COPY --from=openjdk:8-jdk-buster /usr/local/openjdk-8 /usr/local/openjdk-8 COPY --from=openjdk:11-jdk-buster /usr/local/openjdk-11 /usr/local/openjdk-11 -COPY --from=openjdk:16-jdk-buster /usr/local/openjdk-16 /usr/local/openjdk-16 COPY --from=openjdk:17-jdk-buster /usr/local/openjdk-17 /usr/local/openjdk-17 -ENV JAVA_HOME="/usr/local/openjdk-16" +ENV JAVA_HOME="/usr/local/openjdk-17" ENV PATH="${JAVA_HOME}/bin:${PATH}" # [Optional] Uncomment this section to install additional OS packages. diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ce01067c..0d7cbcd2 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -17,7 +17,7 @@ jobs: LD_LIBRARY_PATH: "/usr/lib/x86_64-linux-gnu" strategy: matrix: - jdk: [8, 11, 16] + jdk: [8, 11, 17] steps: - uses: actions/checkout@v2 - name: Cache M2 local repository @@ -29,11 +29,11 @@ jobs: run: | sudo apt-get -y update sudo apt-get -y install libopenblas-dev libarpack2-dev gcc-aarch64-linux-gnu gcc-x86-64-linux-gnu - # Build with JDK 16 - - name: Set up JDK 16 + # Build with JDK 17 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 16 + java-version: 17 - name: Build run: mvn --batch-mode compile test-compile # Test with JDK ${{ matrix.jdk }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 917796f5..5384fd43 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: LD_LIBRARY_PATH: "/usr/lib/x86_64-linux-gnu" strategy: matrix: - jdk: [8, 11, 16] + jdk: [8, 11, 17] steps: - uses: actions/checkout@v2 - name: Cache M2 local repository @@ -29,11 +29,11 @@ jobs: run: | sudo apt-get -y update sudo apt-get -y install libopenblas-dev libarpack2-dev gcc-aarch64-linux-gnu gcc-x86-64-linux-gnu - # Build with JDK 16 - - name: Set up JDK 16 + # Build with JDK 17 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 16 + java-version: 17 - name: Build run: mvn --batch-mode compile test-compile # Test with JDK ${{ matrix.jdk }} @@ -62,10 +62,10 @@ jobs: run: | sudo apt-get -y update sudo apt-get -y install gcc-aarch64-linux-gnu gcc-x86-64-linux-gnu - - name: Set up JDK 16 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: # running setup-java again overwrites the settings.xml - java-version: 16 + java-version: 17 server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD @@ -97,22 +97,22 @@ jobs: needs: [release] strategy: matrix: - jdk: [8, 11, 16] + jdk: [8, 11, 17] implementation: ["java", "native"] filter: ["dev.ludovic.netlib.benchmarks.blas.l1", "dev.ludovic.netlib.benchmarks.blas.l2", "dev.ludovic.netlib.benchmarks.blas.l3"] include: - - jdk: 16 + - jdk: 17 implementation: "java" filter: "dev.ludovic.netlib.benchmarks.blas.l1" - jvmArgs: "--add-modules=jdk.incubator.vector" - - jdk: 16 + jvmArgs: "--add-modules=jdk.incubator.vector,jdk.incubator.foreign -Dforeign.restricted=permit" + - jdk: 17 implementation: "java" filter: "dev.ludovic.netlib.benchmarks.blas.l2" - jvmArgs: "--add-modules=jdk.incubator.vector" - - jdk: 16 + jvmArgs: "--add-modules=jdk.incubator.vector,jdk.incubator.foreign -Dforeign.restricted=permit" + - jdk: 17 implementation: "java" filter: "dev.ludovic.netlib.benchmarks.blas.l3" - jvmArgs: "--add-modules=jdk.incubator.vector" + jvmArgs: "--add-modules=jdk.incubator.vector,jdk.incubator.foreign -Dforeign.restricted=permit" steps: - name: Set up JDK ${{ matrix.jdk }} uses: actions/setup-java@v1