improve release workflow

Signed-off-by: Sebastian Hoß <seb@xn--ho-hia.de>
metio · Jan 17, 2024 · d54ce58 · d54ce58
1 parent c18f5bf
commit d54ce58
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 24 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,6 +7,6 @@ updates:
     assignees:
       - sebhoss
     labels:
-      - Build :: GitHub
-      - Priority :: Low
-      - Type :: Task
+      - "Build :: GitHub"
+      - "Priority :: Low"
+      - "Type :: Task"
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,4 @@
+changelog:
+  exclude:
+    labels:
+      - "Release :: Ignore"
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -1,9 +1,7 @@
 name: Run Benchmarks
 on:
-  workflow_run:
-    workflows: [Automated Release]
-    types:
-      - completed
+  release:
+    types: [released]
 env:
   JAVA_VERSION: 17
   JAVA_PACKAGE: jdk
@@ -53,3 +51,29 @@ jobs:
         with:
           commit_message: Update benchmark data for ${{ steps.last_release.outputs.tag }}
           file_pattern: yosql-website/*.json
+      - id: cpr
+        name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.PAT }}
+          commit-message: Update benchmarks for latest release
+          committer: GitHub <noreply@github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          title: Update benchmarks for latest release
+          body: ${{ steps.gwu.outputs.version-information }}
+          labels: |
+            Release :: Ignore
+            Benchmarks :: CodeGen
+            Benchmarks :: DAO
+            Priority :: Low
+            Type :: Task
+          assignees: sebhoss
+          draft: false
+          base: main
+          branch: update-benchmarks
+          delete-branch: true
+      - name: Enable Pull Request Automerge
+        if: steps.cpr.outputs.pull-request-operation == 'created'
+        run: gh pr merge --rebase --auto "${{ steps.cpr.outputs.pull-request-number }}"
+        with:
+          token: ${{ secrets.PAT }}
diff --git a/.github/workflows/release-announcement.yml b/.github/workflows/release-announcement.yml
@@ -1,9 +1,7 @@
 name: Announce Release
 on:
-  workflow_run:
-    workflows: [Automated Release]
-    types:
-      - completed
+  release:
+    types: [released]
 jobs:
   announce:
     name: Send Announcements

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - id: commits
         name: Count Commits
-        run: echo "count=$(git rev-list --count ${{ steps.last_release.outputs.tag }}..HEAD)" >> $GITHUB_OUTPUT
+        run: echo "count=$(git rev-list --count ${{ steps.last_release.outputs.tag }}..HEAD) -- pom.xml yosql-codegen yosql-internals yosql-models yosql-tooling" >> $GITHUB_OUTPUT
       - id: release
         name: Create Release Version
         if: steps.commits.outputs.count > 0
@@ -149,7 +149,7 @@ jobs:
       - id: upload-ant-tooling
         name: Upload Ant Tooling Artifact
         if: needs.prepare.outputs.commit_count > 0
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: yosql-tooling-ant
           path: ./yosql-tooling/yosql-tooling-ant/target/yosql-tooling-ant-*-dist*
@@ -195,28 +195,28 @@ jobs:
       - id: upload-jvm-cli-tooling
         name: Upload JVM CLI Tooling
         if: needs.prepare.outputs.commit_count > 0 && runner.os == 'Linux'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: yosql-tooling-cli-jvm
           path: ./yosql-tooling/yosql-tooling-cli/target/yosql-tooling-cli-*-jvm*
       - id: upload-linux-cli-tooling
         name: Upload Linux CLI Tooling
         if: needs.prepare.outputs.commit_count > 0 && runner.os == 'Linux'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: yosql-tooling-cli-linux
           path: ./yosql-tooling/yosql-tooling-cli/target/yosql-tooling-cli-*-linux*
       - id: upload-mac-cli-tooling
         name: Upload Mac OSX CLI Tooling
         if: needs.prepare.outputs.commit_count > 0 && runner.os == 'macOS'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: yosql-tooling-cli-mac
           path: ./yosql-tooling/yosql-tooling-cli/target/yosql-tooling-cli-*-mac*
       - id: upload-windows-cli-tooling
         name: Upload Windows CLI Tooling
         if: needs.prepare.outputs.commit_count > 0 && runner.os == 'Windows'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: yosql-tooling-cli-windows
           path: ./yosql-tooling/yosql-tooling-cli/target/yosql-tooling-cli-*-windows*
@@ -236,7 +236,7 @@ jobs:
       - id: download
         name: Download Artifacts
         if: needs.prepare.outputs.commit_count > 0
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
       - id: create_release

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -88,9 +88,9 @@ jobs:
         run: mvn --batch-mode --projects yosql-examples/yosql-examples-ant --also-make --also-make-dependents verify
       - id: upload-ant-tooling
         name: Upload Ant Tooling
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: yosql-tooling-ant
+          name: yosql-tooling-ant-${{ matrix.os }}
           path: ./yosql-tooling/yosql-tooling-ant/target/yosql-tooling-ant-*-dist*
   cli:
     name: Build CLI Tooling on ${{ matrix.os }}
@@ -121,28 +121,28 @@ jobs:
         run: mvn --batch-mode --projects yosql-examples/yosql-examples-cli --also-make --also-make-dependents verify
       - id: upload-jvm-cli-tooling
         name: Upload JVM CLI Tooling
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: runner.os == 'Linux'
         with:
           name: yosql-tooling-cli-jvm
           path: ./yosql-tooling/yosql-tooling-cli/target/yosql-tooling-cli-*-jvm*
       - id: upload-linux-cli-tooling
         name: Upload Linux CLI Tooling
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: runner.os == 'Linux'
         with:
           name: yosql-tooling-cli-linux
           path: ./yosql-tooling/yosql-tooling-cli/target/yosql-tooling-cli-*-linux*
       - id: upload-mac-cli-tooling
         name: Upload Mac OSX CLI Tooling
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: runner.os == 'macOS'
         with:
           name: yosql-tooling-cli-mac
           path: ./yosql-tooling/yosql-tooling-cli/target/yosql-tooling-cli-*-mac*
       - id: upload-windows-cli-tooling
         name: Upload Windows CLI Tooling
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: runner.os == 'Windows'
         with:
           name: yosql-tooling-cli-windows