diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 501dc5ee4..1a375a8e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,11 +26,35 @@ on: - 'README*' jobs: + build-test-data: + runs-on: ubuntu-latest + name: build test data app + steps: + - uses: actions/checkout@v4 + name: checkout + + - uses: actions/setup-java@v3 + name: set up jdk 17 + with: + distribution: 'temurin' + java-version: '17' + + - name: maven cache + uses: actions/cache@v3 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + + - name: build with maven + run: mvn -B formatter:validate impsort:check install -pl 'testsuite/data' + build: runs-on: ubuntu-latest + needs: build-test-data strategy: matrix: - java: [ 11, 17 ] + java: [ 11, 17, 21 ] name: build with jdk ${{matrix.java}} steps: @@ -51,7 +75,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: build with maven - run: mvn -B formatter:validate impsort:check install -Pcoverage -Pgradle-smoke-test + run: mvn -B formatter:validate impsort:check install -pl '!testsuite/data' -Pcoverage -Pgradle-smoke-test ## Store information about the build context for Sonar scan in separate job - name: Save Build Context @@ -78,6 +102,7 @@ jobs: javadoc: name: verify javadocs runs-on: ubuntu-latest + needs: build-test-data steps: - uses: actions/checkout@v4 name: checkout @@ -96,10 +121,11 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: generate javadocs - run: mvn -B install javadoc:javadoc -DskipTests + run: mvn -B install javadoc:javadoc -pl '!testsuite/data' -DskipTests tck-reporting: runs-on: ubuntu-latest + needs: build-test-data strategy: matrix: include: @@ -126,7 +152,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: build with maven - run: mvn -B -pl '!testsuite/extra,!tools,!tools/gradle-plugin,!tools/maven-plugin,!ui,!ui/open-api-ui,!ui/open-api-ui-forms' install -DskipTests + run: mvn -B install -pl '!testsuite/data,!testsuite/extra,!tools,!tools/gradle-plugin,!tools/maven-plugin,!ui,!ui/open-api-ui,!ui/open-api-ui-forms' -DskipTests - name: execute tck ${{ matrix.tck-version }} run: mvn -B test -f testsuite/tck/pom.xml -Dsmallrye.commit=$(git rev-parse HEAD) -Dversion.eclipse.microprofile.openapi=${{ matrix.tck-version }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 134551d86..853fbc62a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: maven cache uses: actions/cache@v3 @@ -61,12 +61,6 @@ jobs: cache-read-only: true arguments: publishPlugins -Pgradle.publish.key=${{secrets.GRADLE_PUBLISH_KEY}} -Pgradle.publish.secret=${{secrets.GRADLE_PUBLISH_SECRET}} - - uses: actions/upload-artifact@v3 - name: tck-report - with: - name: tck-report - path: testsuite/tck/target/surefire-reports - - uses: radcortez/milestone-release-action@main name: milestone release with: @@ -112,7 +106,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: build with maven - run: mvn -B -pl '!testsuite/extra,!tools,!tools/gradle-plugin,!tools/maven-plugin,!ui,!ui/open-api-ui,!ui/open-api-ui-forms' install -DskipTests + run: mvn -B -pl '!testsuite/data,!testsuite/extra,!tools,!tools/gradle-plugin,!tools/maven-plugin,!ui,!ui/open-api-ui,!ui/open-api-ui-forms' install -DskipTests - name: execute tck ${{ matrix.tck-version }} run: mvn -B test -f testsuite/tck/pom.xml -Dsmallrye.commit=$(git rev-parse HEAD) -Dversion.eclipse.microprofile.openapi=${{ matrix.tck-version }} diff --git a/testsuite/data/pom.xml b/testsuite/data/pom.xml index 6f00b0e55..722405cbc 100644 --- a/testsuite/data/pom.xml +++ b/testsuite/data/pom.xml @@ -18,7 +18,6 @@ ${java.version} ${java.version} ${java.version} - 1.1.1 quarkus-bom io.quarkus 3.5.3 @@ -224,61 +223,4 @@ - - - - build-with-downloaded-jdk17 - - (,17) - - - - - com.igormaznitsa - mvn-jlink-wrapper - ${version.mvn-jlink-wrapper} - - - download-jdk - - cache-jdk - - - ${project.basedir}/jdk-cache - custom-jdk-path - ADOPT - - ${java.version} - x64 - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - default-compile - - ${custom-jdk-path}/bin/javac - true - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - ${custom-jdk-path}/bin/javadoc - - - - - -