From 980858f225f13c6fcc93f4546a75c22abda9c0c8 Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 25 Jun 2025 17:50:35 +0100 Subject: [PATCH 1/7] Use new actions --- .github/workflows/github_release.yml | 20 ++------------- .github/workflows/jpackage.yml | 38 ---------------------------- settings.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 .github/workflows/jpackage.yml diff --git a/.github/workflows/github_release.yml b/.github/workflows/github_release.yml index f066ddf..d8c7c0a 100644 --- a/.github/workflows/github_release.yml +++ b/.github/workflows/github_release.yml @@ -4,23 +4,7 @@ on: workflow_dispatch: jobs: - jpackage: - name: Run JPackage - uses: ./.github/workflows/jpackage.yml - - release: - needs: jpackage + build: permissions: contents: write - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - uses: actions/download-artifact@v4 - - - name: Release - env: - GH_TOKEN: ${{ github.token }} - run: gh release create --draft ${{ github.ref_name }} --title ${{ github.ref_name }} build/*.jar + uses: qupath/actions/.github/workflows/github-release.yml@main diff --git a/.github/workflows/jpackage.yml b/.github/workflows/jpackage.yml deleted file mode 100644 index f6772bb..0000000 --- a/.github/workflows/jpackage.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Java CI with Gradle - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - workflow_dispatch: - workflow_call: - -permissions: - contents: read - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - - uses: actions/checkout@v4 - - - name: Set up JDK 21 # TODO: check Java version - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'temurin' - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 - - - name: Execute build - run: ./gradlew build - - - uses: actions/upload-artifact@v4 - with: - path: build/libs/*.jar - name: build - retention-days: 7 diff --git a/settings.gradle.kts b/settings.gradle.kts index 5c6ca66..2299e46 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,7 @@ pluginManagement { // TODO: Specify which version of QuPath the extension is targeting here qupath { - version = "0.5.1" + version = "0.6.0-SNAPSHOT" } // Apply QuPath Gradle settings plugin to handle configuration From cf81613c5dcb2830d75ccc46eb387ae04eb64351 Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 25 Jun 2025 17:53:27 +0100 Subject: [PATCH 2/7] Use new actions --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ .github/workflows/maven_release.yml | 12 ++++++++++++ .github/workflows/maven_snapshot.yml | 12 ++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/maven_release.yml create mode 100644 .github/workflows/maven_snapshot.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..1bd4fc7 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,22 @@ +name: Run gradle build + +on: + push: + branches: + - "main" + pull_request: + branches: + - "main" + workflow_dispatch: + +permissions: + contents: read + +jobs: + build: + uses: qupath/actions/.github/workflows/gradle.yml@main + with: + java-version: 17 + java-distribution: liberica + artifact-name: my-silly-artifact-name + gradle-args: build diff --git a/.github/workflows/maven_release.yml b/.github/workflows/maven_release.yml new file mode 100644 index 0000000..dc0b76c --- /dev/null +++ b/.github/workflows/maven_release.yml @@ -0,0 +1,12 @@ +name: Publish release to SciJava Maven + +on: + workflow_dispatch: + +jobs: + build: + name: Publish release + uses: ./.github/workflows/maven.yml + secrets: inherit + with: + release: true diff --git a/.github/workflows/maven_snapshot.yml b/.github/workflows/maven_snapshot.yml new file mode 100644 index 0000000..3461b6f --- /dev/null +++ b/.github/workflows/maven_snapshot.yml @@ -0,0 +1,12 @@ +name: Publish snapshot to SciJava Maven + +on: + workflow_dispatch: + +jobs: + build: + name: Publish snapshot + uses: ./.github/workflows/maven.yml + secrets: inherit + with: + release: true From aceae51749a8b169e4bea3e7cb4620c762ae463b Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 25 Jun 2025 17:54:43 +0100 Subject: [PATCH 3/7] Use new actions --- .github/workflows/build.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1bd4fc7..bce6eb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: branches: - "main" pull_request: - branches: + branches: - "main" workflow_dispatch: @@ -15,8 +15,3 @@ permissions: jobs: build: uses: qupath/actions/.github/workflows/gradle.yml@main - with: - java-version: 17 - java-distribution: liberica - artifact-name: my-silly-artifact-name - gradle-args: build From b173604969c2e25a0d145399dc0e637c88d243ce Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 25 Jun 2025 22:20:06 +0100 Subject: [PATCH 4/7] Update settings.gradle.kts --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 2299e46..b945aef 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,7 @@ pluginManagement { // TODO: Specify which version of QuPath the extension is targeting here qupath { - version = "0.6.0-SNAPSHOT" + version = "0.6.0" } // Apply QuPath Gradle settings plugin to handle configuration From 1b06ae236634c28876f5df91d00ffc10bdfcd356 Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 25 Jun 2025 23:03:08 +0100 Subject: [PATCH 5/7] Simplify --- .github/workflows/maven_release.yml | 12 ------------ .github/workflows/maven_snapshot.yml | 12 ------------ .github/workflows/scijava-maven.yml | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 24 deletions(-) delete mode 100644 .github/workflows/maven_release.yml delete mode 100644 .github/workflows/maven_snapshot.yml create mode 100644 .github/workflows/scijava-maven.yml diff --git a/.github/workflows/maven_release.yml b/.github/workflows/maven_release.yml deleted file mode 100644 index dc0b76c..0000000 --- a/.github/workflows/maven_release.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Publish release to SciJava Maven - -on: - workflow_dispatch: - -jobs: - build: - name: Publish release - uses: ./.github/workflows/maven.yml - secrets: inherit - with: - release: true diff --git a/.github/workflows/maven_snapshot.yml b/.github/workflows/maven_snapshot.yml deleted file mode 100644 index 3461b6f..0000000 --- a/.github/workflows/maven_snapshot.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Publish snapshot to SciJava Maven - -on: - workflow_dispatch: - -jobs: - build: - name: Publish snapshot - uses: ./.github/workflows/maven.yml - secrets: inherit - with: - release: true diff --git a/.github/workflows/scijava-maven.yml b/.github/workflows/scijava-maven.yml new file mode 100644 index 0000000..41b1ac9 --- /dev/null +++ b/.github/workflows/scijava-maven.yml @@ -0,0 +1,17 @@ +name: Publish release to SciJava Maven + +on: + workflow_dispatch: + inputs: + release: + type: boolean + description: Whether to make a release, or if not a snapshot + required: true + +jobs: + build: + name: Publish release + uses: qupath/actions/.github/workflows/scijava-maven.yml@main + secrets: inherit + with: + release: ${{ inputs.release }} From d27c7dde81ba5be7de1ffde9975b1b5e8055302f Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 2 Jul 2025 12:39:22 +0100 Subject: [PATCH 6/7] Update gradle via qupath/actions/.github/workflows/update-gradle.yml --- .github/workflows/update-gradle.yml | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/update-gradle.yml diff --git a/.github/workflows/update-gradle.yml b/.github/workflows/update-gradle.yml new file mode 100644 index 0000000..cf43bf3 --- /dev/null +++ b/.github/workflows/update-gradle.yml @@ -0,0 +1,33 @@ +name: Update gradle version + +on: + workflow_dispatch: + inputs: + gradle-version: + description: Gradle version + default: latest + type: string + required: false + +jobs: + update: + env: + GH_TOKEN: ${{ github.token }} + runs-on: ubuntu-latest + defaults: + run: + shell: bash + steps: + - uses: actions/checkout@v4 + - name: Update gradlew + run: | + ./gradlew wrapper --gradle-version ${{ inputs.gradle-version }} + - name: Commit and push + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + git checkout -b gradle-update + git add . + git commit --allow-empty -m "Update gradle via qupath/actions/.github/workflows/update-gradle.yml" + git push -u origin gradle-update + gh pr create --title "Update gradle via actions" --body "$(./gradlew --version)" From 0654a13dec24ddc6496a3b8ddc44edafc8982142 Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 2 Jul 2025 15:22:24 +0100 Subject: [PATCH 7/7] Reword --- .github/workflows/scijava-maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scijava-maven.yml b/.github/workflows/scijava-maven.yml index 41b1ac9..b1668b4 100644 --- a/.github/workflows/scijava-maven.yml +++ b/.github/workflows/scijava-maven.yml @@ -5,7 +5,7 @@ on: inputs: release: type: boolean - description: Whether to make a release, or if not a snapshot + description: Should this be a release? (if not, do a snapshot) required: true jobs: