use toolchains.xml generated by setup-java

eclipse · May 14, 2024 · 6cc978f · 6cc978f
1 parent 762b1e6
commit 6cc978f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -32,6 +32,9 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
 
+      - name: Copy toolchains.xml
+        run: cat ~/.m2/toolchains.xml | tee toolchains.xml
+
       - name: 'Cache Maven packages'
         uses: actions/cache@v4
         with:
@@ -50,7 +53,7 @@ jobs:
       - name: Build and test
         uses: coactions/setup-xvfb@v1.0.1
         with: 
-          run: ./mvnw --toolchains releng/toolchains.xml clean verify "-Dmaven.home=${{ env.MAVEN_WRAPPER_HOME }}" -PuseJenkinsSnapshots -f org.eclipse.xtext.full.releng
+          run: ./mvnw --toolchains toolchains.xml clean verify "-Dmaven.home=${{ env.MAVEN_WRAPPER_HOME }}" -PuseJenkinsSnapshots -f org.eclipse.xtext.full.releng
 
       - name: Archive Test Results
         uses: actions/upload-artifact@v4
@@ -79,6 +82,9 @@ jobs:
           java-version: 17
           distribution: 'temurin'
 
+      - name: Copy toolchains.xml
+        run: cat ~/.m2/toolchains.xml | tee toolchains.xml
+
       - name: 'Cache Maven packages'
         uses: actions/cache@v4
         with:
@@ -90,7 +96,7 @@ jobs:
         run: echo "MAVEN_WRAPPER_HOME=$(./mvnw --version | grep "Maven home:" | cut -c 13-)" >> "$GITHUB_ENV"
 
       - name: Build Maven artifacts
-        run: ./mvnw --toolchains releng/toolchains.xml clean verify "-Dmaven.home=${{ env.MAVEN_WRAPPER_HOME }}" -PuseJenkinsSnapshots -f org.eclipse.xtext.maven.releng
+        run: ./mvnw --toolchains toolchains.xml clean verify "-Dmaven.home=${{ env.MAVEN_WRAPPER_HOME }}" -PuseJenkinsSnapshots -f org.eclipse.xtext.maven.releng
 
       - name: Archive Test Results
         uses: actions/upload-artifact@v4