From daf03939a92763a104dc593de2057b7d9c28d7d8 Mon Sep 17 00:00:00 2001 From: Abhishek Radhakrishnan Date: Fri, 8 Mar 2024 07:54:02 +0530 Subject: [PATCH] Upgrade GHA dependencies (#15954) * Upgrade actions/checkout from v3 to v4. * Upgrade actions/setup-java from v3 to v4. * Upgrade dorny/paths-filter, actions/cdache/restore, actions/stale to v3, v4 and v9 respectively. * Add a GHA label for .github/** and skip UT/IT on .github files. * remove skipping UT/IT on .github/** changes. --- .github/labeler.yml | 5 +++++ .github/workflows/codeql.yml | 4 ++-- .github/workflows/cron-job-its.yml | 10 +++++----- .github/workflows/distribution-checks.yml | 2 +- .github/workflows/reusable-revised-its.yml | 10 +++++----- .github/workflows/reusable-standard-its.yml | 6 +++--- .github/workflows/reusable-unit-tests.yml | 6 +++--- .github/workflows/revised-its.yml | 2 +- .github/workflows/stale.yml | 2 +- .github/workflows/standard-its.yml | 8 ++++---- .github/workflows/static-checks.yml | 12 ++++++------ .../workflows/unit-and-integration-tests-unified.yml | 10 +++++----- .github/workflows/unit-tests.yml | 2 +- 13 files changed, 42 insertions(+), 37 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 22895a82d8b..e48b7da430a 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -89,3 +89,8 @@ - changed-files: - any-glob-to-any-file: - 'extensions-contrib/kubernetes-overlord-extensions/**' + +'GHA': + - changed-files: + - any-glob-to-any-file: + - '.github/**' diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index fb6bc9a3bb0..7cfeb63cbff 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -35,9 +35,9 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '8' diff --git a/.github/workflows/cron-job-its.yml b/.github/workflows/cron-job-its.yml index 0a5c2f45ce2..aa3f2838288 100644 --- a/.github/workflows/cron-job-its.yml +++ b/.github/workflows/cron-job-its.yml @@ -32,17 +32,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '8' distribution: 'zulu' - name: Cache Maven m2 repository id: maven - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: maven-${{ runner.os }}-8-${{ github.sha }} @@ -117,10 +117,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '8' distribution: 'zulu' diff --git a/.github/workflows/distribution-checks.yml b/.github/workflows/distribution-checks.yml index 82d6b12923f..caadb16b608 100644 --- a/.github/workflows/distribution-checks.yml +++ b/.github/workflows/distribution-checks.yml @@ -36,6 +36,6 @@ jobs: docker-build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build the Docker image run: DOCKER_BUILDKIT=1 docker build -t apache/druid:tag -f distribution/docker/Dockerfile . diff --git a/.github/workflows/reusable-revised-its.yml b/.github/workflows/reusable-revised-its.yml index 60b5261b303..d9237a52aba 100644 --- a/.github/workflows/reusable-revised-its.yml +++ b/.github/workflows/reusable-revised-its.yml @@ -75,31 +75,31 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ inputs.build_jdk }} distribution: 'zulu' - name: Restore Maven repository id: maven-restore - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: ~/.m2/repository key: maven-${{ runner.os }}-${{ inputs.build_jdk }}-${{ github.sha }} - name: Restore targets id: targets-restore - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: ./**/target key: maven-${{ runner.os }}-${{ inputs.build_jdk }}-targets-${{ github.sha }} - name: Retrieve cached docker image id: docker-restore - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: key: druid-container-jdk${{ inputs.build_jdk }}.tar.gz-${{ github.sha }} path: | diff --git a/.github/workflows/reusable-standard-its.yml b/.github/workflows/reusable-standard-its.yml index 821ecd62586..ecc9c3d6544 100644 --- a/.github/workflows/reusable-standard-its.yml +++ b/.github/workflows/reusable-standard-its.yml @@ -60,17 +60,17 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ inputs.runtime_jdk }} distribution: 'zulu' - name: Restore Maven repository id: maven-restore - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: ~/.m2/repository key: maven-${{ runner.os }}-${{ inputs.build_jdk }}-${{ github.sha }} diff --git a/.github/workflows/reusable-unit-tests.yml b/.github/workflows/reusable-unit-tests.yml index 06a48362c40..291cb648b3e 100644 --- a/.github/workflows/reusable-unit-tests.yml +++ b/.github/workflows/reusable-unit-tests.yml @@ -55,13 +55,13 @@ jobs: coverage_failure: ${{ steps.set_outputs.outputs.coverage_failure }} steps: - name: checkout branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # skip the "cache: maven" step from setup-java. We explicitly use a # different cache key since we cannot reuse it across commits. - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ inputs.jdk }} @@ -70,7 +70,7 @@ jobs: # we include github.sha in the cache key to make it specific to that build/jdk - name: Restore Maven repository id: maven-restore - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: ~/.m2/repository key: maven-${{ runner.os }}-${{ inputs.jdk }}-${{ github.sha }} diff --git a/.github/workflows/revised-its.yml b/.github/workflows/revised-its.yml index 900b308569d..202634140fc 100644 --- a/.github/workflows/revised-its.yml +++ b/.github/workflows/revised-its.yml @@ -33,7 +33,7 @@ jobs: # the common extension in revised ITs is different from the one in standard ITs common-extensions: ${{ steps.filter.outputs.common-extensions }} steps: - - uses: dorny/paths-filter@v2 + - uses: dorny/paths-filter@v3 if: github.event_name == 'pull_request' id: filter with: diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index ddf7885d760..53431b94fb1 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -23,7 +23,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: | diff --git a/.github/workflows/standard-its.yml b/.github/workflows/standard-its.yml index 8709b09e596..a2d39751083 100644 --- a/.github/workflows/standard-its.yml +++ b/.github/workflows/standard-its.yml @@ -32,7 +32,7 @@ jobs: core: ${{ steps.filter.outputs.core || github.event_name != 'pull_request'}} common-extensions: ${{ steps.filter.outputs.common-extensions }} steps: - - uses: dorny/paths-filter@v2 + - uses: dorny/paths-filter@v3 if: github.event_name == 'pull_request' id: filter with: @@ -148,10 +148,10 @@ jobs: BUILD_DRUID_CLUSTER: true steps: - name: Checkout branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '8' distribution: 'zulu' @@ -160,7 +160,7 @@ jobs: # we include github.sha in the cache key to make it specific to that build/jdk - name: Restore Maven repository id: maven-restore - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: ~/.m2/repository key: maven-${{ runner.os }}-8-${{ github.sha }} diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml index a7d374d321f..c77d15888ed 100644 --- a/.github/workflows/static-checks.yml +++ b/.github/workflows/static-checks.yml @@ -45,9 +45,9 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.java }} @@ -118,9 +118,9 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '8' @@ -150,9 +150,9 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: '17' diff --git a/.github/workflows/unit-and-integration-tests-unified.yml b/.github/workflows/unit-and-integration-tests-unified.yml index f51985da90f..9651a56b8cb 100644 --- a/.github/workflows/unit-and-integration-tests-unified.yml +++ b/.github/workflows/unit-and-integration-tests-unified.yml @@ -58,11 +58,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 # skip the "cache: maven" step from setup-java. We explicitly use a # different cache key since we cannot reuse it across commits. - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.jdk }} @@ -71,7 +71,7 @@ jobs: # we include github.sha in the cache key to make it specific to that build/jdk - name: Cache Maven m2 repository id: maven - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: maven-${{ runner.os }}-${{ matrix.jdk }}-${{ github.sha }} @@ -79,7 +79,7 @@ jobs: - name: Cache targets id: target - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ./**/target @@ -87,7 +87,7 @@ jobs: - name: Cache image id: docker_container - uses: actions/cache@v3 + uses: actions/cache@v4 with: key: druid-container-jdk${{ matrix.jdk }}.tar.gz-${{ github.sha }} path: | diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 1f75cc4eed8..5adbb78dbd0 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -54,7 +54,7 @@ jobs: # run everything if not a PR core: ${{ steps.filter.outputs.core || github.event_name != 'pull_request'}} steps: - - uses: dorny/paths-filter@v2 + - uses: dorny/paths-filter@v3 if: github.event_name == 'pull_request' id: filter with: