From 6abb33a040d2fa247989a921541d32632638928d Mon Sep 17 00:00:00 2001
From: "Daniel A. A. Pelsmaeker" <developer@pelsmaeker.net>
Date: Tue, 16 Jul 2024 14:47:56 +0200
Subject: [PATCH] Merge build and publish jobs

---
 .github/workflows/build.yaml   | 15 +++++++++++----
 .github/workflows/publish.yaml | 17 -----------------
 2 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 .github/workflows/publish.yaml

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5a69f63..e2d82a4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,5 +1,5 @@
 ---
-name: 'Build'
+name: 'Build & Publish'
 
 on:  # yamllint disable-line rule:truthy
   push:
@@ -10,15 +10,22 @@ on:  # yamllint disable-line rule:truthy
 jobs:
   build:
     uses: metaborg/actions/.github/workflows/gradle-build-matrix.yaml@main
-  publish:
+  publish-snapshot:
     uses: metaborg/actions/.github/workflows/gradle-publish.yaml@main
     with:
       gradle-command: |
-          gradle assemble publish -Pgitonium.isSnapshot=true
+        gradle assemble publish -Pgitonium.isSnapshot=true
       gradle-version-command: |
-          gradle -q :printVersion -Pgitonium.isSnapshot=true
+        gradle -q :printVersion -Pgitonium.isSnapshot=true
     if: "github.event_name == 'push' && github.ref == 'refs/heads/master'"
     needs: [build]
     secrets:
       METABORG_ARTIFACTS_USERNAME: ${{ secrets.METABORG_ARTIFACTS_USERNAME }}
       METABORG_ARTIFACTS_PASSWORD: ${{ secrets.METABORG_ARTIFACTS_PASSWORD }}
+  publish-release:
+    uses: metaborg/actions/.github/workflows/gradle-publish.yaml@main
+    if: "github.event_name == 'push' && startsWith(github.ref, 'refs/tags/release-')"
+    needs: [build]
+    secrets:
+      METABORG_ARTIFACTS_USERNAME: ${{ secrets.METABORG_ARTIFACTS_USERNAME }}
+      METABORG_ARTIFACTS_PASSWORD: ${{ secrets.METABORG_ARTIFACTS_PASSWORD }}
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
deleted file mode 100644
index 2aebea9..0000000
--- a/.github/workflows/publish.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: 'Publish'
-
-on:  # yamllint disable-line rule:truthy
-  push:
-    tags:
-      - "release-*.*.*"
-
-jobs:
-  publish:
-    uses: metaborg/actions/.github/workflows/gradle-publish.yaml@main
-    secrets:
-      METABORG_ARTIFACTS_USERNAME: ${{ secrets.METABORG_ARTIFACTS_USERNAME }}
-      METABORG_ARTIFACTS_PASSWORD: ${{ secrets.METABORG_ARTIFACTS_PASSWORD }}
-      # SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-      # SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      # SIGNING_KEY: ${{ secrets.SIGNING_KEY }}