From 334d8efbe3b789e779a20a7501f722c8fe328ed8 Mon Sep 17 00:00:00 2001 From: Oliver Feldmann Date: Thu, 27 Jul 2023 17:32:27 +0200 Subject: [PATCH 1/3] Fix indentation --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d181b5..5e14ea2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,13 +17,13 @@ jobs: steps: - uses: actions/checkout@master - name: Determine Java version - id: java_version - run: | - if [[ "${{ matrix.base-image-tag }}" == *"-buster" ]] || [[ "${{ matrix.base-image-tag }}" == *"-bullseye" ]]; then - echo "::set-output name=version::11" - else - echo "::set-output name=version::17" - fi + id: java_version + run: | + if [[ "${{ matrix.base-image-tag }}" == *"-buster" ]] || [[ "${{ matrix.base-image-tag }}" == *"-bullseye" ]]; then + echo "::set-output name=version::11" + else + echo "::set-output name=version::17" + fi - name: Test run: | chmod +x runTests.sh && ./runTests.sh ${{ matrix.base-image-tag }} ${{ steps.java_version.outputs.version }} From 0ddd11a66e2d7553ca565e8c85cfdd01161dd38a Mon Sep 17 00:00:00 2001 From: Oliver Feldmann Date: Thu, 27 Jul 2023 17:55:51 +0200 Subject: [PATCH 2/3] Fix setting version --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e14ea2..a567846 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,9 +20,9 @@ jobs: id: java_version run: | if [[ "${{ matrix.base-image-tag }}" == *"-buster" ]] || [[ "${{ matrix.base-image-tag }}" == *"-bullseye" ]]; then - echo "::set-output name=version::11" + echo 'version=11' >> $GITHUB_OUTPUT else - echo "::set-output name=version::17" + echo 'version=17' >> $GITHUB_OUTPUT fi - name: Test run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c00228..0ae1bb4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,9 +19,9 @@ jobs: id: java_version run: | if [[ "${{ matrix.base-image-tag }}" == *"-buster" ]] || [[ "${{ matrix.base-image-tag }}" == *"-bullseye" ]]; then - echo "::set-output name=version::11" + echo 'version=11' >> $GITHUB_OUTPUT else - echo "::set-output name=version::17" + echo 'version=17' >> $GITHUB_OUTPUT fi - name: Test run: | From 9494f7b373fe78586c026313b9f1858e4f42019f Mon Sep 17 00:00:00 2001 From: Oliver Feldmann Date: Thu, 27 Jul 2023 18:06:59 +0200 Subject: [PATCH 3/3] Fix docker arg --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8d93379..28c7ef0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ ARG BASE_IMAGE_TAG -ARG JAVA_VERSION FROM node:$BASE_IMAGE_TAG +ARG JAVA_VERSION + RUN apt-get update && \ apt-get install -y chromium firefox-esr xvfb libxi6 libgbm1 libgconf-2-4 openjdk-"${JAVA_VERSION}"-jre && \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* && \