diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d181b5..a567846 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 'version=11' >> $GITHUB_OUTPUT + else + echo 'version=17' >> $GITHUB_OUTPUT + fi - name: Test run: | chmod +x runTests.sh && ./runTests.sh ${{ matrix.base-image-tag }} ${{ steps.java_version.outputs.version }} 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: | 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/* && \