From 3a9e27f800d53a6b1ae373eeac880840162265aa Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Tue, 14 May 2024 17:38:52 +0200 Subject: [PATCH 1/2] [CI] Add Java 21 compiling to J17 and native J21 Signed-off-by: Holger Friedrich --- .github/workflows/ci-build.yml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e0fd259e1d..cfe68f54f8 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ '17' ] + java: [ '17', '21', 'profile-j21' ] maven: [ '3.9.6' ] python: [ '3.12' ] os: [ 'ubuntu-22.04' ] @@ -47,6 +47,14 @@ jobs: - name: Set up Java ${{ matrix.java }} uses: actions/setup-java@v4 + if: ${{ matrix.java == 'profile-j21' }} + with: + distribution: 'temurin' + java-version: ${{ 21 }} + + - name: Set up Java ${{ matrix.java }} + uses: actions/setup-java@v4 + if: ${{ matrix.java != 'profile-j21' }} with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -69,6 +77,18 @@ jobs: echo "::add-matcher::.github/openhab-compile-problems.json" - name: Build + if: ${{ matrix.java == 'profile-j21' }} + id: build-j21 + run: './.github/scripts/maven-build clean verify -B -T 1.5C -U -Pj21' + env: + MAVEN_OPTS: >- + -Xmx2g + -Dmaven.wagon.http.retryHandler.count=5 + -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: Build + if: ${{ matrix.java != 'profile-j21' }} id: build run: './.github/scripts/maven-build' env: @@ -79,14 +99,14 @@ jobs: -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: Upload Build Log - if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }} + if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure') || (steps.build-j21.outcome == 'success') || (steps.build-j21.outcome == 'failure')) }} uses: actions/upload-artifact@v4 with: name: build-log-java-${{ matrix.java }}-${{ matrix.os }} path: build.log - name: Upload SAT Summary Report - if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }} + if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure') || (steps.build-j21.outcome == 'success') || (steps.build-j21.outcome == 'failure')) }} uses: actions/upload-artifact@v4 with: name: sat-summary-report From 9fbbec715d963435221c0c0aab6bb30bd74f9801 Mon Sep 17 00:00:00 2001 From: Holger Friedrich Date: Tue, 14 May 2024 17:49:22 +0200 Subject: [PATCH 2/2] upload only one sat report Signed-off-by: Holger Friedrich --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index cfe68f54f8..ac4e2c7f62 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -106,7 +106,7 @@ jobs: path: build.log - name: Upload SAT Summary Report - if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure') || (steps.build-j21.outcome == 'success') || (steps.build-j21.outcome == 'failure')) }} + if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure') || (steps.build-j21.outcome == 'success') || (steps.build-j21.outcome == 'failure')) }} uses: actions/upload-artifact@v4 with: name: sat-summary-report