Skip to content

Commit

Permalink
Merge pull request #4995 from openequella/ci/java-21-build
Browse files Browse the repository at this point in the history
ci(github): bump java to 21
  • Loading branch information
edalex-ian authored Jan 11, 2024
2 parents 3faf300 + fed582d commit 7c98e08
Showing 1 changed file with 6 additions and 28 deletions.
34 changes: 6 additions & 28 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ jobs:
with:
node-version-file: '.nvmrc'

- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 11
java-version: 21

- name: Install node dependencies (oeq-rest-api)
working-directory: oeq-ts-rest-api
Expand Down Expand Up @@ -179,28 +179,6 @@ jobs:
name: Storybook
path: react-front-end/storybook.tar

build_import_export_tool:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 11

- name: Build
working-directory: import-export-tool
run: |
./gradlew build
- name: Save primary artefacts
uses: actions/[email protected]
with:
name: ImportExportTools
path: import-export-tool/build/libs/

functional_testing:
needs: build_and_check

Expand Down Expand Up @@ -244,11 +222,11 @@ jobs:
ffmpeg \
libimage-exiftool-perl
- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 11
java-version: 21

- uses: actions/checkout@v4

Expand Down Expand Up @@ -369,11 +347,11 @@ jobs:
ffmpeg \
libimage-exiftool-perl
- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: adopt
java-version: 11
java-version: 21

- name: Setup node
uses: actions/setup-node@v3
Expand Down

0 comments on commit 7c98e08

Please sign in to comment.