From 7111bd7858f156f1cc6553fa4db769bcb34b3224 Mon Sep 17 00:00:00 2001 From: Christoph Fink Date: Thu, 2 Mar 2023 13:58:04 +0200 Subject: [PATCH 1/3] Run on older image, as ubuntu-latest has gradle-8, which fails --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 22691e6d1..2fadec21c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,7 +12,7 @@ on: # - master jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 # Start a separate docker container that we can contact over TCP (for tests) # Apparently there's something tricky going on with the port binding though # https://help.github.com/en/articles/workflow-syntax-for-github-actions#jobsjob_idservices From d691b7b54bd091ed1e38d90a25980e7641ea1200 Mon Sep 17 00:00:00 2001 From: Christoph Fink Date: Thu, 2 Mar 2023 15:52:06 +0200 Subject: [PATCH 2/3] freeze gradle version --- .github/workflows/gradle.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2fadec21c..8541f68f3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,7 +12,7 @@ on: # - master jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest # Start a separate docker container that we can contact over TCP (for tests) # Apparently there's something tricky going on with the port binding though # https://help.github.com/en/articles/workflow-syntax-for-github-actions#jobsjob_idservices @@ -36,6 +36,10 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + - name: Install gradle + uses: gradle/gradle-build-action@v2 + with: + gradle-version: 7.5.1 - uses: actions/cache@v1 id: cache with: From 52dcf99beaddc91dadf0f5bf8adaf54132f60e36 Mon Sep 17 00:00:00 2001 From: Christoph Fink Date: Thu, 2 Mar 2023 17:21:18 +0200 Subject: [PATCH 3/3] refactor workflow, correct repo package address --- .github/workflows/gradle.yml | 7 +++---- build.gradle | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1ac6e5707..4055faa2e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -37,10 +37,6 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 - - name: Install gradle - uses: gradle/gradle-build-action@v2 - with: - gradle-version: 7.5.1 - uses: actions/cache@v1 id: cache with: @@ -49,6 +45,9 @@ jobs: - name: Show version string run: gradle -q printVersion | head -n1 - name: Build and Test + uses: gradle/gradle-build-action@v2 + with: + gradle-version: 7.5.1 run: gradle build - name: Ensure shadow JAR is runnable as local backend run: | diff --git a/build.gradle b/build.gradle index f259fdd37..9851b4592 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ publishing { repositories { maven { name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/DigitalGeographyLab/dgl-r5") + url = uri("https://maven.pkg.github.com/DigitalGeographyLab/r5") credentials { username = System.getenv("GITHUB_ACTOR") password = System.getenv("GITHUB_TOKEN")