From d94806fb366349e249368b74cdedc5642f910124 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Mon, 26 Feb 2024 20:09:41 -0800 Subject: [PATCH 1/2] Migrate from gradle-cache-action to setup-gradle burrunan/gradle-cache-action seems unmaintained, with the last release in August 2020. gradle/actions/setup-gradle is the officially maintained by Gradle action that has been getting a lot of work done recently. See https://github.com/deephaven/deephaven-core/issues/5161 --- .github/workflows/branch-ci.yml | 7 ++++--- .github/workflows/edge-ci.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml index d7a0ed1..8c9bb03 100644 --- a/.github/workflows/branch-ci.yml +++ b/.github/workflows/branch-ci.yml @@ -41,12 +41,13 @@ jobs: .github/scripts/gradle-properties.sh >> gradle.properties cat gradle.properties + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Assemble distribution - uses: burrunan/gradle-cache-action@v1 with: job-id: build-server - arguments: --scan outputVersion server-jetty-app:assemble py-server:assemble - gradle-version: wrapper + run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble - uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml index 8dab633..f65a6f9 100644 --- a/.github/workflows/edge-ci.yml +++ b/.github/workflows/edge-ci.yml @@ -39,12 +39,13 @@ jobs: .github/scripts/gradle-properties.sh >> gradle.properties cat gradle.properties + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Assemble distribution - uses: burrunan/gradle-cache-action@v1 with: job-id: build-server - arguments: --scan outputVersion server-jetty-app:assemble py-server:assemble - gradle-version: wrapper + run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble - uses: actions/upload-artifact@v4 with: From 482ac9c3b4887708bb2255a792ecb6d3928b0ae9 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Mon, 26 Feb 2024 20:15:33 -0800 Subject: [PATCH 2/2] remove job-id --- .github/workflows/branch-ci.yml | 2 -- .github/workflows/edge-ci.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml index 8c9bb03..add87d2 100644 --- a/.github/workflows/branch-ci.yml +++ b/.github/workflows/branch-ci.yml @@ -45,8 +45,6 @@ jobs: uses: gradle/actions/setup-gradle@v3 - name: Assemble distribution - with: - job-id: build-server run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble - uses: actions/upload-artifact@v4 diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml index f65a6f9..ccabe11 100644 --- a/.github/workflows/edge-ci.yml +++ b/.github/workflows/edge-ci.yml @@ -43,8 +43,6 @@ jobs: uses: gradle/actions/setup-gradle@v3 - name: Assemble distribution - with: - job-id: build-server run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble - uses: actions/upload-artifact@v4