diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1a2eac8b..39d64b02 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -18,43 +18,43 @@ jobs: matrix: # test against latest update of each major Java version, as well as specific updates of LTS versions: RUNTIME: [ol, wlp] - RUNTIME_VERSION: [22.0.0.6, 22.0.0.3] + RUNTIME_VERSION: [22.0.0.6, 22.0.0.9] java: [17, 11, 8] exclude: - java: 8 - RUNTIME_VERSION: 22.0.0.3 + RUNTIME_VERSION: 22.0.0.6 - java: 17 - RUNTIME_VERSION: 22.0.0.3 + RUNTIME_VERSION: 22.0.0.6 name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Linux steps: # Checkout repos - name: Checkout ci.gradle - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Java ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'adopt' java-version: ${{ matrix.java }} cache: 'gradle' - name: Checkout ci.common - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: OpenLiberty/ci.common path: ci.common - name: Checkout ci.ant - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: OpenLiberty/ci.ant path: ci.ant # Cache mvn/gradle packages - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Cache Gradle packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.gradle/caches @@ -83,7 +83,7 @@ jobs: working-directory: build/reports/tests env: BUILD_REPORTS_PATH: /buildReports/${{runner.os}}/java${{matrix.java}}/${{matrix.RUNTIME}}-${{matrix.RUNTIME_VERSION}}/ - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ failure() }} with: name: buildReportsArtifact @@ -98,22 +98,22 @@ jobs: matrix: # test against latest update of each major Java version, as well as specific updates of LTS versions: RUNTIME: [ol, wlp] - RUNTIME_VERSION: [22.0.0.6, 22.0.0.3] + RUNTIME_VERSION: [22.0.0.6, 22.0.0.9] java: [17, 11, 8] exclude: - java: 8 - RUNTIME_VERSION: 22.0.0.3 + RUNTIME_VERSION: 22.0.0.6 - java: 8 RUNTIME: wlp - java: 17 - RUNTIME_VERSION: 22.0.0.3 + RUNTIME_VERSION: 22.0.0.6 name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Windows steps: # Checkout repos - name: Checkout ci.gradle - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Java ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'adopt' java-version: ${{ matrix.java }} @@ -126,13 +126,13 @@ jobs: git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant # Cache mvn/gradle packages - name: Cache Maven packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Cache Gradle packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.gradle/caches @@ -151,14 +151,14 @@ jobs: - name: Run tests with Gradle on Windows working-directory: C:/ci.gradle # LibertyTest is excluded because test0_run hangs - run: ./gradlew clean install check -P"test.exclude"="**/Polling*,**/TestLoose*,**/LibertyTest*" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}" --stacktrace --info --no-daemon + run: ./gradlew clean install check -P"test.exclude"="**/Polling*,**/TestLoose*,**/LibertyTest*,**/GenerateFeaturesTest*" -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}" --stacktrace --info --no-daemon timeout-minutes: 75 # Copy build reports and upload artifact if build failed - name: Copy build/report/tests/test for upload if: ${{ failure() }} working-directory: C:/ci.gradle run: cp -r build/reports/tests/test D:/buildReports/${{runner.os}}/java${{matrix.java}}/${{matrix.RUNTIME}}-${{matrix.RUNTIME_VERSION}}/ - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ failure() }} with: name: buildReportsArtifact diff --git a/build.gradle b/build.gradle index dae31fa6..a5c2d37b 100644 --- a/build.gradle +++ b/build.gradle @@ -59,8 +59,8 @@ compileTestGroovy { targetCompatibility = JavaVersion.VERSION_1_7 } -def libertyAntVersion = "1.9.10" -def libertyCommonVersion = "1.8.23-SNAPSHOT" +def libertyAntVersion = "1.9.11" +def libertyCommonVersion = "1.8.23" dependencies { implementation gradleApi()