Skip to content

Commit ae190b0

Browse files
authored
Merge pull request #45 from SAP/o-liver-patch-1
Fix workflow and java version
2 parents a0d6680 + 9494f7b commit ae190b0

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@master
1919
- name: Determine Java version
20-
id: java_version
21-
run: |
22-
if [[ "${{ matrix.base-image-tag }}" == *"-buster" ]] || [[ "${{ matrix.base-image-tag }}" == *"-bullseye" ]]; then
23-
echo "::set-output name=version::11"
24-
else
25-
echo "::set-output name=version::17"
26-
fi
20+
id: java_version
21+
run: |
22+
if [[ "${{ matrix.base-image-tag }}" == *"-buster" ]] || [[ "${{ matrix.base-image-tag }}" == *"-bullseye" ]]; then
23+
echo 'version=11' >> $GITHUB_OUTPUT
24+
else
25+
echo 'version=17' >> $GITHUB_OUTPUT
26+
fi
2727
- name: Test
2828
run: |
2929
chmod +x runTests.sh && ./runTests.sh ${{ matrix.base-image-tag }} ${{ steps.java_version.outputs.version }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
id: java_version
2020
run: |
2121
if [[ "${{ matrix.base-image-tag }}" == *"-buster" ]] || [[ "${{ matrix.base-image-tag }}" == *"-bullseye" ]]; then
22-
echo "::set-output name=version::11"
22+
echo 'version=11' >> $GITHUB_OUTPUT
2323
else
24-
echo "::set-output name=version::17"
24+
echo 'version=17' >> $GITHUB_OUTPUT
2525
fi
2626
- name: Test
2727
run: |

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
ARG BASE_IMAGE_TAG
2-
ARG JAVA_VERSION
32

43
FROM node:$BASE_IMAGE_TAG
54

5+
ARG JAVA_VERSION
6+
67
RUN apt-get update && \
78
apt-get install -y chromium firefox-esr xvfb libxi6 libgbm1 libgconf-2-4 openjdk-"${JAVA_VERSION}"-jre && \
89
rm -rf /var/lib/apt/lists/* /var/cache/apt/* && \

0 commit comments

Comments
 (0)