Skip to content

Commit

Permalink
Merge pull request #45 from SAP/o-liver-patch-1
Browse files Browse the repository at this point in the history
Fix workflow and java version
  • Loading branch information
o-liver committed Jul 28, 2023
2 parents a0d6680 + 9494f7b commit ae190b0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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/* && \
Expand Down

0 comments on commit ae190b0

Please sign in to comment.