diff --git a/.github/workflows/smoketest.yml b/.github/workflows/maven-verify.yml similarity index 66% rename from .github/workflows/smoketest.yml rename to .github/workflows/maven-verify.yml index faae99f410..e2e20dba8d 100644 --- a/.github/workflows/smoketest.yml +++ b/.github/workflows/maven-verify.yml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -name: Unit Tests +name: Verify on: push: @@ -25,20 +25,9 @@ on: jobs: build: - name: Build on MacOS - runs-on: macOS-latest - timeout-minutes: 120 - - steps: - - name: Checkout - uses: actions/checkout@v1 - - - name: Set up JDK 17 - uses: actions/setup-java@v2.4.0 - with: - distribution: 'temurin' - java-version: 17 - cache: 'maven' - - - name: Build with Maven - run: mvn clean install -e -B -V -nsu --no-transfer-progress -P run-its -DskipITs + name: Verify + uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v1 + with: + ff-goal: 'install' + verify-goal: 'install -P run-its' + verify-fail-fast: false diff --git a/.github/workflows/maven-windows-it1.yml b/.github/workflows/maven-windows-it1.yml deleted file mode 100644 index d801ea21d9..0000000000 --- a/.github/workflows/maven-windows-it1.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -name: GitHub CI for Windows 1 - -on: - push: - branches-ignore: - - dependabot/** - pull_request: - - -jobs: - build: - name: Build1 on Windows - runs-on: windows-latest - timeout-minutes: 90 - - strategy: - fail-fast: false - - steps: - - name: Checkout - uses: actions/checkout@v1 - - - name: Set up JDK 1.8 - uses: actions/setup-java@v2.4.0 - with: - distribution: 'temurin' - java-version: 8 - cache: 'maven' - - - name: Build with Maven - run: mvn clean install -e -B -V -nsu --no-transfer-progress -P run-its "-Dit.test=**/jiras/*IT*.java,TestMethodPatternIT,TestMultipleMethodPatternsIT,TestMultipleMethodPatternsTestNGIT" - - - name: Upload artifact surefire-its - uses: actions/upload-artifact@v2-preview - #if: failure() - with: - name: ${{ matrix.os }}-surefire-its - path: | - surefire-its/target/*/log.txt - surefire-its/target/**/surefire-reports/* - surefire-its/target/**/failsafe-reports/* - !surefire-its/target/*-1617 - !surefire-its/target/failsafe-reports diff --git a/.github/workflows/maven-windows-it2.yml b/.github/workflows/maven-windows-it2.yml deleted file mode 100644 index 3056c9abda..0000000000 --- a/.github/workflows/maven-windows-it2.yml +++ /dev/null @@ -1,62 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -name: GitHub CI for Windows 2 - -on: - push: - branches-ignore: - - dependabot/** - pull_request: - -jobs: - build: - name: Build2 on Windows - runs-on: windows-latest - timeout-minutes: 90 - - strategy: - fail-fast: false - - steps: - - name: Checkout - uses: actions/checkout@v1 - - - name: Set up JDK 1.8 - uses: actions/setup-java@v2.4.0 - with: - distribution: 'temurin' - java-version: 8 - cache: 'maven' - - - name: Build with Maven with Install - run: mvn clean install -e -B -V -nsu --no-transfer-progress -DskipTests - - - name: Build with Maven without Unit Tests - run: mvn clean install -e -B -V -nsu --no-transfer-progress -rf :surefire-its -P run-its "-Dit.test=!**/jiras/*IT*.java,!TestMethodPatternIT,!TestMultipleMethodPatternsIT,!TestMultipleMethodPatternsTestNGIT" - - - name: Upload artifact surefire-its - uses: actions/upload-artifact@v2-preview - if: failure() - with: - name: ${{ matrix.os }}-surefire-its - path: | - surefire-its/target/*/log.txt - surefire-its/target/**/surefire-reports/* - surefire-its/target/**/failsafe-reports/* - !surefire-its/target/*-1617 - !surefire-its/target/failsafe-reports diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index f31d5382fb..0000000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,64 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -name: GitHub CI for *Nix - -on: - push: - branches-ignore: - - dependabot/** - pull_request: - - -jobs: - build: - - strategy: - matrix: - os: [ubuntu-latest, macOS-latest] - java: [8, 11, 17] - jdk: [temurin, zulu] - fail-fast: false - - runs-on: ${{ matrix.os }} - timeout-minutes: 120 - - steps: - - name: Checkout - uses: actions/checkout@v1 - - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2.4.0 - with: - distribution: ${{ matrix.jdk }} - java-version: ${{ matrix.java }} - cache: 'maven' - - - name: Build with Maven - run: mvn clean install -e -B -V -nsu --no-transfer-progress -P run-its -Dfailsafe-integration-test-port=8083 - - - name: Upload artifact surefire-its - uses: actions/upload-artifact@v2-preview - if: failure() - with: - name: ${{ matrix.os }}-surefire-its - path: | - surefire-its/target/*/log.txt - surefire-its/target/**/surefire-reports/* - surefire-its/target/**/failsafe-reports/* - !surefire-its/target/*-1617 - !surefire-its/target/failsafe-reports diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index ded9cefe77..e11d7992cf 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -41,8 +41,8 @@ Failsafe Surefire - 8084 - 8085 + 8184 + 8185