From e46c2567c9539d5589ba3434f0e11e05b52dc02e Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Tue, 5 Mar 2024 08:29:50 +0100 Subject: [PATCH 1/2] Node v20 compatibility Use new actions which are Node 20 compatible to get rid of warning. --- .github/workflows/ci-gradle-nexus.yml | 13 +++++++------ .github/workflows/ci-gradle.yml | 11 ++++++----- .../workflows/publish-containerized-gradle-app.yml | 11 ++++++----- .github/workflows/publish-maven-artifact.yml | 9 +++++---- .github/workflows/publish-maven-central.yml | 13 +++++++------ .github/workflows/repository-backup.yml | 3 ++- 6 files changed, 33 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci-gradle-nexus.yml b/.github/workflows/ci-gradle-nexus.yml index d920767..740fdfb 100644 --- a/.github/workflows/ci-gradle-nexus.yml +++ b/.github/workflows/ci-gradle-nexus.yml @@ -77,13 +77,14 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 + show-progress: false - uses: gradle/wrapper-validation-action@v1 ######################## # The biggest divergence point is choosing between actions/setup-java or graalvm - - uses: actions/setup-java@v3.10.0 + - uses: actions/setup-java@v4 if: (!(inputs.build_on_graal)) with: distribution: temurin @@ -98,19 +99,19 @@ jobs: if: inputs.build_on_graal && inputs.install_graal_languages != '' run: gu install ${{ inputs.install_graal_languages }} ######################## - - uses: google-github-actions/auth@v1 + - uses: google-github-actions/auth@v2 if: inputs.setup_google_cloud_auth with: credentials_json: ${{ secrets.GCR_KEY }} - - uses: google-github-actions/setup-gcloud@v1.1.1 + - uses: google-github-actions/setup-gcloud@v2 if: inputs.setup_google_cloud_auth - name: build - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: ${{ env.GRADLE_SWITCHES }} build - name: publish-snapshots if: inputs.publish_snapshots && github.event_name != 'pull_request' && github.repository_owner == 'moderneinc' - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: ${{ env.GRADLE_SWITCHES }} snapshot publish -PforceSigning -x test env: diff --git a/.github/workflows/ci-gradle.yml b/.github/workflows/ci-gradle.yml index 16ab2d3..eb68acf 100644 --- a/.github/workflows/ci-gradle.yml +++ b/.github/workflows/ci-gradle.yml @@ -63,26 +63,27 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 + show-progress: false - name: Setup git user run: | git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)" git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)" - uses: gradle/wrapper-validation-action@v1 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{ inputs.java_version }} - - uses: google-github-actions/auth@v1 + - uses: google-github-actions/auth@v2 if: inputs.setup_google_cloud_auth with: credentials_json: ${{ secrets.GCR_KEY }} - - uses: google-github-actions/setup-gcloud@v1.1.1 + - uses: google-github-actions/setup-gcloud@v2 if: inputs.setup_google_cloud_auth - name: build - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: ${{ env.GRADLE_SWITCHES }} build - name: publish-tests diff --git a/.github/workflows/publish-containerized-gradle-app.yml b/.github/workflows/publish-containerized-gradle-app.yml index d522dbf..af900f1 100644 --- a/.github/workflows/publish-containerized-gradle-app.yml +++ b/.github/workflows/publish-containerized-gradle-app.yml @@ -22,10 +22,11 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v3 + show-progress: false + - uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{ inputs.java_version }} @@ -35,10 +36,10 @@ jobs: git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" - - uses: google-github-actions/auth@v1 + - uses: google-github-actions/auth@v2 with: credentials_json: ${{ secrets.GCR_KEY }} - - uses: google-github-actions/setup-gcloud@v1.1.1 + - uses: google-github-actions/setup-gcloud@v2 - run: gcloud auth configure-docker - run: rm -rf /opt/hostedtoolcache/CodeQL @@ -46,7 +47,7 @@ jobs: - run: rm -rf /opt/hostedtoolcache/go - run: rm -rf /opt/hostedtoolcache/node - name: build, tag, and push docker image - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 env: TESTCONTAINERS_RYUK_DISABLED: true GRGIT_USER: ${{ github.actor }} diff --git a/.github/workflows/publish-maven-artifact.yml b/.github/workflows/publish-maven-artifact.yml index 1bd187b..c384d38 100644 --- a/.github/workflows/publish-maven-artifact.yml +++ b/.github/workflows/publish-maven-artifact.yml @@ -44,11 +44,12 @@ jobs: if: github.repository_owner == 'moderneinc' steps: - name: git-checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 + show-progress: false - name: set-up-jdk - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -58,9 +59,9 @@ jobs: git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" - name: setup-gcloud - uses: google-github-actions/auth@v1 + uses: google-github-actions/auth@v2 with: credentials_json: ${{ secrets.google_cloud_service_account_key }} - - uses: google-github-actions/setup-gcloud@v1.1.1 + - uses: google-github-actions/setup-gcloud@v2 - name: build, test, and publish jar run: ./gradlew ${GRADLE_SWITCHES} ${GRGIT_AUTH_SWITCHES} -Prelease.scope=${{ inputs.release_scope }} final diff --git a/.github/workflows/publish-maven-central.yml b/.github/workflows/publish-maven-central.yml index 67098bd..e1ba06f 100644 --- a/.github/workflows/publish-maven-central.yml +++ b/.github/workflows/publish-maven-central.yml @@ -61,22 +61,23 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v3.10.0 + show-progress: false + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 - - uses: google-github-actions/auth@v1 + - uses: google-github-actions/auth@v2 if: inputs.setup_google_cloud_auth with: credentials_json: ${{ secrets.GCR_KEY }} - - uses: google-github-actions/setup-gcloud@v1.1.1 + - uses: google-github-actions/setup-gcloud@v2 if: inputs.setup_google_cloud_auth - name: publish-candidate if: contains(github.ref, '-rc.') - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: | ${{ env.GRADLE_SWITCHES }} @@ -89,7 +90,7 @@ jobs: - name: publish-release if: (!contains(github.ref, '-rc.')) - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: | ${{ env.GRADLE_SWITCHES }} diff --git a/.github/workflows/repository-backup.yml b/.github/workflows/repository-backup.yml index ae0bcf3..4fcbdb3 100644 --- a/.github/workflows/repository-backup.yml +++ b/.github/workflows/repository-backup.yml @@ -35,9 +35,10 @@ jobs: repository-backup: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 + show-progress: false - uses: peter-evans/s3-backup@v1 env: ACCESS_KEY_ID: ${{ secrets.bucket_access_key_id }} From 73cffae7e85d6787beaadf9cfb9c316cade0736c Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Wed, 6 Mar 2024 13:17:11 +0100 Subject: [PATCH 2/2] Adopt gradle/actions/setup-gradle --- .github/workflows/ci-gradle-nexus.yml | 4 ++-- .github/workflows/ci-gradle.yml | 2 +- .github/workflows/publish-containerized-gradle-app.yml | 2 +- .github/workflows/publish-maven-central.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-gradle-nexus.yml b/.github/workflows/ci-gradle-nexus.yml index 740fdfb..a73c862 100644 --- a/.github/workflows/ci-gradle-nexus.yml +++ b/.github/workflows/ci-gradle-nexus.yml @@ -106,12 +106,12 @@ jobs: - uses: google-github-actions/setup-gcloud@v2 if: inputs.setup_google_cloud_auth - name: build - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: arguments: ${{ env.GRADLE_SWITCHES }} build - name: publish-snapshots if: inputs.publish_snapshots && github.event_name != 'pull_request' && github.repository_owner == 'moderneinc' - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: arguments: ${{ env.GRADLE_SWITCHES }} snapshot publish -PforceSigning -x test env: diff --git a/.github/workflows/ci-gradle.yml b/.github/workflows/ci-gradle.yml index eb68acf..b2b7918 100644 --- a/.github/workflows/ci-gradle.yml +++ b/.github/workflows/ci-gradle.yml @@ -83,7 +83,7 @@ jobs: - uses: google-github-actions/setup-gcloud@v2 if: inputs.setup_google_cloud_auth - name: build - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: arguments: ${{ env.GRADLE_SWITCHES }} build - name: publish-tests diff --git a/.github/workflows/publish-containerized-gradle-app.yml b/.github/workflows/publish-containerized-gradle-app.yml index af900f1..76d3d1f 100644 --- a/.github/workflows/publish-containerized-gradle-app.yml +++ b/.github/workflows/publish-containerized-gradle-app.yml @@ -47,7 +47,7 @@ jobs: - run: rm -rf /opt/hostedtoolcache/go - run: rm -rf /opt/hostedtoolcache/node - name: build, tag, and push docker image - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 env: TESTCONTAINERS_RYUK_DISABLED: true GRGIT_USER: ${{ github.actor }} diff --git a/.github/workflows/publish-maven-central.yml b/.github/workflows/publish-maven-central.yml index e1ba06f..dc263e3 100644 --- a/.github/workflows/publish-maven-central.yml +++ b/.github/workflows/publish-maven-central.yml @@ -77,7 +77,7 @@ jobs: if: inputs.setup_google_cloud_auth - name: publish-candidate if: contains(github.ref, '-rc.') - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: arguments: | ${{ env.GRADLE_SWITCHES }} @@ -90,7 +90,7 @@ jobs: - name: publish-release if: (!contains(github.ref, '-rc.')) - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 with: arguments: | ${{ env.GRADLE_SWITCHES }}