From 31a574fc08d988686c0ed385e06f4f9761138235 Mon Sep 17 00:00:00 2001 From: Sebastian Erives Date: Sat, 12 Sep 2026 21:33:26 -0600 Subject: [PATCH 1/2] Improve actions workflow conditions and names --- ...ease-central.yml => build-and-publish.yml} | 2 +- .github/workflows/build-and-release.yml | 58 +++++++++++++++++++ .github/workflows/release.yml | 53 ----------------- 3 files changed, 59 insertions(+), 54 deletions(-) rename .github/workflows/{release-central.yml => build-and-publish.yml} (95%) create mode 100644 .github/workflows/build-and-release.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release-central.yml b/.github/workflows/build-and-publish.yml similarity index 95% rename from .github/workflows/release-central.yml rename to .github/workflows/build-and-publish.yml index f7cf2b7b..f0e0f534 100644 --- a/.github/workflows/release-central.yml +++ b/.github/workflows/build-and-publish.yml @@ -1,4 +1,4 @@ -name: Publish package to the Maven Central Repository +name: Build & Publish to the Maven Central Repository on: push: # Pattern matched against refs/tags diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml new file mode 100644 index 00000000..0865557a --- /dev/null +++ b/.github/workflows/build-and-release.yml @@ -0,0 +1,58 @@ +name: Build & Release + +on: + push: + branches: [ master, dev ] + tags: [ 'v*' ] + +jobs: + build-and-release: + # Run only on tags starting with 'v' or on branches other than 'master' (i.e. 'dev') + if: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref != 'refs/heads/master' }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + # Release build (tagged) + - name: Build release shadow jar with Gradle + if: ${{ startsWith(github.ref, 'refs/tags/v') }} + env: + PLUGINSIGNING_PRIVATE: ${{ secrets.DELTACV_PLUGINSIGNING_PRIVATE }} + run: ./gradlew -Penv=release shadowJar -x test + + # Dev build (commits to dev branch) + - name: Build dev shadow jar with Gradle + if: ${{ !startsWith(github.ref, 'refs/tags/v') }} + env: + PLUGINSIGNING_PRIVATE: ${{ secrets.DELTACV_PLUGINSIGNING_PRIVATE }} + run: | + SHA_SHORT="$(git rev-parse --short HEAD)" + ./gradlew -Phash=$SHA_SHORT shadowJar -x test + + # Dev rolling release + - name: Publish rolling dev release + uses: pyTooling/Actions/releaser@r0 + if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'refs/heads/master' }} + with: + token: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ github.ref_name }} + rm: true + files: | + VisionBenchPlugin/build/libs/*.jar + + # Official tagged release + - name: Publish tagged release + uses: softprops/action-gh-release@v2 + if: ${{ startsWith(github.ref, 'refs/tags/v') }} + with: + token: ${{ secrets.GITHUB_TOKEN }} + files: 'VisionBenchPlugin/build/libs/*.jar' \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index a8016873..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Create GitHub release(s) - -on: - push: - branches: [ master, dev ] - tags: 'v*' - -jobs: - build-and-release: - if: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref != 'ref/heads/master' }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: 'temurin' - java-version: '17' - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Build release shadow jar with Gradle - env: - PLUGINSIGNING_PRIVATE: ${{ secrets.DELTACV_PLUGINSIGNING_PRIVATE }} - run: ./gradlew -Penv=release shadowJar -x test - if: ${{ startsWith(github.ref, 'refs/tags/v') }} - - - name: Build dev shadow jar with Gradle - env: - PLUGINSIGNING_PRIVATE: ${{ secrets.DELTACV_PLUGINSIGNING_PRIVATE }} - run: | - SHA_SHORT="$(git rev-parse --short HEAD)" - ./gradlew -Phash=$SHA_SHORT shadowJar -x test - if: ${{ !startsWith(github.ref, 'refs/tags/v') }} - - - uses: pyTooling/Actions/releaser@r0 - with: - token: ${{ secrets.GITHUB_TOKEN }} - tag: 'Dev' - rm: true - files: | - VisionBenchPlugin/build/libs/*.jar - if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v')}} - - - uses: softprops/action-gh-release@v2 - if: ${{ startsWith(github.ref, 'refs/tags/v') }} - with: - token: ${{ secrets.GITHUB_TOKEN }} - files: 'VisionBenchPlugin/build/libs/*.jar' - - - From 854ca0cd8f331d0fa465d9be617e50f06ced47ff Mon Sep 17 00:00:00 2001 From: Sebastian Erives Date: Sat, 12 Sep 2026 21:38:39 -0600 Subject: [PATCH 2/2] Change project group to org.deltacv.VisionGraph --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5f8020e6..fdce9001 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ buildscript { } allprojects { - group 'org.deltacv.PaperVision' + group 'org.deltacv.VisionGraph' version '2027.0.0' ext {