diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a54f3dfbc..0f5011b20 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,5 +1,5 @@ # -# Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -37,7 +37,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK uses: actions/setup-java@v2 @@ -54,11 +54,11 @@ jobs: # If you wish to specify custom queries, you can do so here or in a config file. # By default, queries listed here will override any specified in a config file. # Prefix the list here with "+" to use these queries and those in the config file. - + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs # queries: security-extended,security-and-quality - + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) # - name: Autobuild @@ -67,7 +67,7 @@ jobs: # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - # If the Autobuild fails above, remove it and uncomment the following three lines. + # If the Autobuild fails above, remove it and uncomment the following three lines. # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. - run: | diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e66e840eb..cd8f861da 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -1,5 +1,5 @@ # -# Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved. # # This program and the accompanying materials are made available under the # terms of the Eclipse Distribution License v. 1.0, which is available at @@ -12,9 +12,13 @@ name: JAXWS RI on: [push, pull_request] +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + jobs: build: - name: Test on JDK ${{ matrix.java_version }} + name: Test on JDK ${{ matrix.java_version }} runs-on: ubuntu-latest outputs: jdk: ${{ steps.build.outputs.jdk }} @@ -23,17 +27,12 @@ jobs: java_version: [ 17 ] steps: - - name: Cancel previous runs of this workflow - uses: styfle/cancel-workflow-action@0.11.0 - with: - all_but_latest: true - access_token: ${{ github.token }} - name: Checkout for build - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.java_version }} @@ -44,9 +43,9 @@ jobs: cd jaxws-ri mvn -B -V -U -C -Pstaging,oss-release,dependency-check clean verify org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Dgpg.skip=true -Doss.disallow.snapshots=false -Dittest=true cd .. - echo "::set-output name=jdk::${{ matrix.java_version }}" + echo "jdk=${{ matrix.java_version }}" >> $GITHUB_OUTPUT - name: Upload binary image - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: success() with: name: binary @@ -64,16 +63,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ needs.build.outputs.jdk }} - name: Checkout tests - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Download binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: binary - name: Test