diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml index 7ecf85a..db1241d 100644 --- a/.github/workflows/build-image.yaml +++ b/.github/workflows/build-image.yaml @@ -22,7 +22,7 @@ jobs: steps: - name: Git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: persist-credentials: false @@ -33,7 +33,7 @@ jobs: - name: Set up JDK 25 if: inputs.image != 'uaa-server' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: temurin java-version: '25' diff --git a/.github/workflows/build_config_server.yaml b/.github/workflows/build_config_server.yaml index ccc1836..7b802fe 100644 --- a/.github/workflows/build_config_server.yaml +++ b/.github/workflows/build_config_server.yaml @@ -19,7 +19,7 @@ on: - 'build.ps1' concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: diff --git a/.github/workflows/build_eureka_server.yaml b/.github/workflows/build_eureka_server.yaml index f2e5339..bef5be5 100644 --- a/.github/workflows/build_eureka_server.yaml +++ b/.github/workflows/build_eureka_server.yaml @@ -19,7 +19,7 @@ on: - 'build.ps1' concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: diff --git a/.github/workflows/build_springboot_admin_server.yaml b/.github/workflows/build_springboot_admin_server.yaml index e2fbef9..8101da5 100644 --- a/.github/workflows/build_springboot_admin_server.yaml +++ b/.github/workflows/build_springboot_admin_server.yaml @@ -19,7 +19,7 @@ on: - 'build.ps1' concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: diff --git a/.github/workflows/build_uaa_server.yaml b/.github/workflows/build_uaa_server.yaml index ee6fe8a..a78d9c3 100644 --- a/.github/workflows/build_uaa_server.yaml +++ b/.github/workflows/build_uaa_server.yaml @@ -19,7 +19,7 @@ on: - 'build.ps1' concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true permissions: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 50b7e41..ff7365d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -34,7 +34,7 @@ jobs: steps: - name: Git checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: persist-credentials: false @@ -50,7 +50,7 @@ jobs: - name: Set up JDK 25 if: steps.filter.outputs.skip != 'true' && matrix.image != 'uaa-server' - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: temurin java-version: '25'