From fed582db88922eb4f52845268cb091c5bd9d611b Mon Sep 17 00:00:00 2001 From: Ian Stevenson Date: Tue, 9 Jan 2024 09:10:05 +1100 Subject: [PATCH] ci(github): bump java to 21 Including remove the build of import/export tool which is not possible currently with java 21 due to issues with WSDL plugin. See import-export-tool/README.md. --- .github/workflows/ci.yaml | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fc64cfc668..445f010c3b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 @@ -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/upload-artifact@v3.1.3 - with: - name: ImportExportTools - path: import-export-tool/build/libs/ - functional_testing: needs: build_and_check @@ -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 @@ -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