Skip to content

Commit

Permalink
[Build] Use generated Maven toolchains.xml instead of own one
Browse files Browse the repository at this point in the history
The supplied own toolchains.xml provides JDKs that probably don't match
the GitHub workflow environment.
  • Loading branch information
HannesWell authored and akurtakov committed Mar 29, 2024
1 parent a6ad93f commit 89f2443
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 41 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: |
8
17
mvn-toolchain-id: |
JavaSE-1.8
JavaSE-17
distribution: 'temurin'
cache: maven
- name: Set up Maven
Expand All @@ -38,7 +43,6 @@ jobs:
run: >-
mvn
--batch-mode
--global-toolchains ${{ github.workspace }}/.github/workflows/toolchains.xml
-Pbree-libs
-Papi-check
-Dcompare-version-with-baselines.skip=false
Expand Down Expand Up @@ -176,7 +180,12 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: |
8
17
mvn-toolchain-id: |
JavaSE-1.8
JavaSE-17
distribution: 'temurin'
cache: maven
- name: Set up Maven
Expand All @@ -188,7 +197,6 @@ jobs:
mvn
-U
--batch-mode
--global-toolchains ${{ github.workspace }}/.github/workflows/toolchains.xml
--threads 1C
-Pbuild-individual-bundles
-Pbree-libs
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: |
8
17
mvn-toolchain-id: |
JavaSE-1.8
JavaSE-17
distribution: 'temurin'
cache: maven
- name: Set up Maven
Expand All @@ -60,7 +65,6 @@ jobs:
run: >-
mvn
--batch-mode
--global-toolchains ${{ github.workspace }}/.github/workflows/toolchains.xml
-Pbree-libs
-Papi-check
-Dcompare-version-with-baselines.skip=false
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/toolchains.xml

This file was deleted.

0 comments on commit 89f2443

Please sign in to comment.