From 11e393a038f1343cec1ed6bbef3d836888768f12 Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 25 Jun 2025 17:50:38 +0100 Subject: [PATCH 1/5] Use new actions --- .github/workflows/gradle.yml | 42 -------------------------- .github/workflows/publish-release.yml | 32 -------------------- .github/workflows/publish-snapshot.yml | 31 ------------------- 3 files changed, 105 deletions(-) delete mode 100644 .github/workflows/gradle.yml delete mode 100644 .github/workflows/publish-release.yml delete mode 100644 .github/workflows/publish-snapshot.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml deleted file mode 100644 index 05d3c7c..0000000 --- a/.github/workflows/gradle.yml +++ /dev/null @@ -1,42 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle - -name: Java CI with Gradle - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - workflow_dispatch: - -permissions: - contents: read - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 21 - uses: actions/setup-java@v3 - with: - java-version: '21' - distribution: 'temurin' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Build with Gradle - uses: gradle/gradle-build-action@v2 - with: - arguments: build - - uses: actions/upload-artifact@v4 - with: - name: jar - path: build/libs - retention-days: 7 diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml deleted file mode 100644 index 731a7c3..0000000 --- a/.github/workflows/publish-release.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Publish release to SciJava Maven - -on: - release: - types: [published] - -jobs: - publish: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 21 - uses: actions/setup-java@v3 - with: - java-version: '21' - distribution: 'temurin' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Publish snapshot - uses: gradle/gradle-build-action@v2 - with: - arguments: publish -P release=true - env: - MAVEN_USER: ${{ secrets.MAVEN_USER }} - MAVEN_PASS: ${{ secrets.MAVEN_PASS }} - - uses: actions/upload-artifact@v4 - with: - name: jar - path: build/libs - retention-days: 7 \ No newline at end of file diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml deleted file mode 100644 index f5bf647..0000000 --- a/.github/workflows/publish-snapshot.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Publish snapshot to SciJava Maven - -on: - workflow_dispatch: - -jobs: - publish: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 21 - uses: actions/setup-java@v3 - with: - java-version: '21' - distribution: 'temurin' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Publish snapshot - uses: gradle/gradle-build-action@v2 - with: - arguments: publish - env: - MAVEN_USER: ${{ secrets.MAVEN_USER }} - MAVEN_PASS: ${{ secrets.MAVEN_PASS }} - - uses: actions/upload-artifact@v4 - with: - name: jar - path: build/libs - retention-days: 7 \ No newline at end of file From 11ca9dc7965b64d65d1047213566cb4a6b89c560 Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 25 Jun 2025 17:53:30 +0100 Subject: [PATCH 2/5] Use new actions --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ .github/workflows/github_release.yml | 10 ++++++++++ .github/workflows/maven_release.yml | 12 ++++++++++++ .github/workflows/maven_snapshot.yml | 12 ++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/github_release.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/github_release.yml b/.github/workflows/github_release.yml new file mode 100644 index 0000000..d8c7c0a --- /dev/null +++ b/.github/workflows/github_release.yml @@ -0,0 +1,10 @@ +name: Make draft release + +on: + workflow_dispatch: + +jobs: + build: + permissions: + contents: write + uses: qupath/actions/.github/workflows/github-release.yml@main 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 d57e9f568e96304567af4bfca148badc8d27e5b5 Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 25 Jun 2025 17:54:46 +0100 Subject: [PATCH 3/5] 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 5e64b644fcdc02c26e4c1d97c982c4ba39310037 Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 25 Jun 2025 23:03:35 +0100 Subject: [PATCH 4/5] 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 bee0ecfc71a0b71e5cdc842526fbbda9b46da0eb Mon Sep 17 00:00:00 2001 From: Alan O'Callaghan Date: Wed, 2 Jul 2025 12:39:24 +0100 Subject: [PATCH 5/5] 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)"