Switch fully to reuseable workflows

oblivioncth · Aug 29, 2024 · 0d2d36c · 0d2d36c
1 parent cfce756
commit 0d2d36c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 123 deletions.
diff --git a/.github/workflows/build-qx.yml b/.github/workflows/build-qx.yml
@@ -1,13 +1,18 @@
-name: Qx Push Reaction
+name: Build Project
 on:
   workflow_dispatch:
   push:
     branches-ignore:
     - 'master'
+  workflow_run:
+    workflows: Tag and Sync
+    types: completed
+    branches: master
 
 jobs:
-  trigger-windows-build:
-    name: Build Qx
+  trigger-build:
+    name: Build Project
+    if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success'
     uses: oblivioncth/actions/.github/workflows/build-cxx-project.yml@feature/upgrades
     secrets:
       ffynnon_cred: ${{ secrets.OBYBOT_FFYNNON_CREDS }}

diff --git a/.../workflows/master-pull-request-checks.yml → .github/workflows/check-release-pr.yml b/.../workflows/master-pull-request-checks.yml → .github/workflows/check-release-pr.yml
@@ -1,12 +1,12 @@
-name: Master pull-request checks
+name: Check Release PR When Opened
 on:
   pull_request:
     types: [opened, synchronize, reopened]
     branches: master
 
 jobs:
   check-pr-correctness:
-    name: Master PR correctness check
+    name: Release PR correctness check
     runs-on: windows-latest
     steps:
     - name: Ensure higher version

diff --git a/.github/workflows/generate-release.yml b/.github/workflows/generate-release.yml
@@ -0,0 +1,15 @@
+name: Generate Release
+on:
+  workflow_run:
+    workflows: Build Project
+    types: completed
+    branches: master
+
+jobs:
+  generate_release:
+    name: Generate Release
+    if: github.event.workflow_run.conclusion == 'success'
+    uses: oblivioncth/actions/.github/workflows/generate-cxx-release.yml@feature/upgrades
+    with:
+        artifacts_run_id: ${{ github.event.workflow_run.id }}
+
diff --git a/.github/workflows/pull-request-labeler.yml → .github/workflows/label-pr.yml b/.github/workflows/pull-request-labeler.yml → .github/workflows/label-pr.yml
@@ -1,4 +1,4 @@
-name: Pull-request auto-labeler
+name: Label PR When Opened
 on:
   pull_request:
     types: [opened]

diff --git a/.github/workflows/master-pull-request-merge-reaction.yml b/.github/workflows/master-pull-request-merge-reaction.yml
diff --git a/.github/workflows/tag-release-commit-and-sync-dev.yml b/.github/workflows/tag-release-commit-and-sync-dev.yml
@@ -0,0 +1,12 @@
+name: Tag and Sync
+on:
+  pull_request:
+    types: [closed]
+    branches:
+    - 'master'
+
+jobs:
+  tag_master_and_sync_dev:
+    name: Tag master merge commit, FF back to dev
+    if: github.event.pull_request.merged == true
+    uses: oblivioncth/actions/.github/workflows/tag-main-and-sync-dev.yml@feature/upgrades