GRM-48: refactor: consolidate CI workflows to eliminate redundant runs

2026-06-22 00:01:58 +00:00
parent 5b4aaffa3b
commit d8d025789b
7 changed files with 154 additions and 167 deletions
@@ -3,8 +3,6 @@ name: CI
 on:
  pull_request:
    types: [opened, synchronize]
-  push:
-    branches: [master]
  workflow_dispatch:

 jobs:
@@ -68,13 +66,8 @@ jobs:
      - name: Detect changed paths
        id: detect
        run: |
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            BASE="origin/master"
-            HEAD="${{ github.event.pull_request.head.sha }}"
-          else
-            BASE="HEAD~1"
-            HEAD="HEAD"
-          fi
+          BASE="origin/master"
+          HEAD="${{ github.event.pull_request.head.sha }}"
          # Check if any Ansible-related files changed
          ANSIBLE_CHANGED=$(git diff --name-only "$BASE" "$HEAD" -- ansible/ .ansible-lint 2>/dev/null | head -1)
          if [ -n "$ANSIBLE_CHANGED" ]; then
@@ -94,33 +87,6 @@ jobs:
            echo "No user-facing files changed — skipping release dry-run."
          fi

-  validate-merge:
-    if: github.event_name == 'push'
-    runs-on: docker
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-      - name: Validate commit message format
-        run: |
-          set -euo pipefail
-          MSG=$(git log -1 --pretty=%s)
-          echo "Commit message: $MSG"
-          # Allowed formats:
-          #   GRM-N <type>: <description>     (squash-merge)
-          #   release: vX.Y.Z                  (release commits)
-          #   GRM-N <type>: <description> (#M) (squash-merge with PR ref)
-          if echo "$MSG" | grep -qE '^GRM-[0-9]+ [a-z]+: .+'; then
-            echo "OK: GRM-N <conventional> format"
-          elif echo "$MSG" | grep -qE '^release: v[0-9]+\.[0-9]+\.[0-9]+'; then
-            echo "OK: release commit format"
-          else
-            echo "FAIL: commit message does not follow naming convention"
-            echo "Expected: GRM-N <type>: <description> or release: vX.Y.Z"
-            echo "Got:      $MSG"
-            exit 1
-          fi
-
  discover-runners:
    needs: [detect-changes]
    if: needs.detect-changes.outputs.ansible-changed == 'true'
@@ -178,34 +144,6 @@ jobs:
          MATRIX_INDEX: ${{ matrix.runner-index }}
          GITEA_REPOSITORY: ${{ github.repository }}

-  badges:
-    needs: [quality]
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-    runs-on: docker
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.REPO_TOKEN }}
-      - name: Set up environment
-        run: make setup
-      - name: Generate badge JSON files
-        run: |
-          . .venv/bin/activate
-          python3 scripts/generate_badges.py --output-dir .badges/
-      - name: Push badges to badges branch
-        env:
-          PRE_COMMIT_ALLOW_NO_CONFIG: "1"
-        run: |
-          git config user.name "gitea-actions-bot"
-          git config user.email "actions@oblachno.fyi"
-          git checkout --orphan badges
-          git rm -rf .
-          cp -r .badges/* .
-          git add *.svg
-          git commit --no-verify -m "Update badges [skip ci]"
-          git push origin badges --force
-
  pr-review:
    if: github.event_name == 'pull_request'
    runs-on: docker
@@ -1,11 +1,127 @@
-name: Post-merge Vikunja update
+name: Post-merge
+
+# Runs on every push to master. A single workflow with conditional jobs
+# replaces the previous 4 separate workflows (release.yml, post-merge.yml,
+# sync-wiki.yml, and the badges job from ci.yml).
+#
+# Job dependency graph:
+#
+#   detect-type ──┬── release (skip if release commit)
+#                 ├── sync-wiki (skip if release commit)
+#                 ├── badges (skip if release commit)
+#                 └── vikunja (skip if release commit)
+#
+# When release.py creates a "release: vX.Y.Z" commit, all jobs skip
+# because it's a release commit. The tag push triggers publish.yml.

 on:
  push:
    branches: [master]

 jobs:
+  detect-type:
+    runs-on: docker
+    outputs:
+      is-release: ${{ steps.check.outputs.is-release }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: Check if this is a release commit
+        id: check
+        run: |
+          MSG=$(git log -1 --pretty=%s)
+          echo "Commit message: $MSG"
+          if echo "$MSG" | grep -qE '^release: v[0-9]+\.[0-9]+\.[0-9]+'; then
+            echo "is-release=true" >> "$GITHUB_OUTPUT"
+            echo "Release commit — skipping all post-merge jobs."
+          else
+            echo "is-release=false" >> "$GITHUB_OUTPUT"
+            echo "Regular merge commit — running all post-merge jobs."
+          fi
+
+  release:
+    needs: [detect-type]
+    if: needs.detect-type.outputs.is-release == 'false'
+    runs-on: docker
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.REPO_TOKEN }}
+      - name: Set up environment
+        run: make setup
+      - name: Install git-cliff
+        run: |
+          GIT_CLIFF_VERSION="2.13.0"
+          URL="https://github.com/orhun/git-cliff/releases/download/v${GIT_CLIFF_VERSION}/git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-gnu.tar.gz"
+          TMPDIR="$(mktemp -d)"
+          curl -sL "$URL" | tar xz -C "$TMPDIR"
+          mkdir -p "$HOME/.local/bin"
+          mv "$TMPDIR/git-cliff-${GIT_CLIFF_VERSION}/git-cliff" "$HOME/.local/bin/git-cliff"
+          chmod +x "$HOME/.local/bin/git-cliff"
+          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+          "$HOME/.local/bin/git-cliff" --version
+      - name: Configure git
+        run: |
+          git config user.name "grm-ci-bot"
+          git config user.email "grm-ci-bot@oblachno.fyi"
+      - name: Run release
+        env:
+          PYTHONPATH: .
+        run: |
+          . .venv/bin/activate
+          python3 scripts/ci/release.py
+
+  sync-wiki:
+    needs: [detect-type]
+    if: needs.detect-type.outputs.is-release == 'false'
+    runs-on: docker
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up environment
+        run: make setup
+      - name: Sync documentation to wiki
+        env:
+          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
+          PYTHONPATH: src
+        run: |
+          . .venv/bin/activate
+          python3 scripts/ci/sync_wiki.py --repo "${{ github.repository }}" --strict
+
+  badges:
+    needs: [detect-type]
+    if: needs.detect-type.outputs.is-release == 'false'
+    runs-on: docker
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.REPO_TOKEN }}
+      - name: Set up environment
+        run: make setup
+      - name: Generate badge SVG files
+        run: |
+          . .venv/bin/activate
+          python3 scripts/generate_badges.py --output-dir .badges/
+      - name: Push badges to badges branch
+        env:
+          PRE_COMMIT_ALLOW_NO_CONFIG: "1"
+        run: |
+          git config user.name "gitea-actions-bot"
+          git config user.email "actions@oblachno.fyi"
+          git checkout --orphan badges
+          git rm -rf .
+          cp -r .badges/* .
+          git add *.svg
+          git commit --no-verify -m "Update badges [skip ci]"
+          git push origin badges --force
+
  vikunja:
+    needs: [detect-type]
+    if: needs.detect-type.outputs.is-release == 'false'
    runs-on: docker
    steps:
      - uses: actions/checkout@v4
@@ -1,49 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches: [master]
-
-jobs:
-  release:
-    runs-on: docker
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.REPO_TOKEN }}
-      - name: Set up environment
-        run: make setup
-      - name: Install git-cliff
-        run: |
-          GIT_CLIFF_VERSION="2.13.0"
-          URL="https://github.com/orhun/git-cliff/releases/download/v${GIT_CLIFF_VERSION}/git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-gnu.tar.gz"
-          TMPDIR="$(mktemp -d)"
-          curl -sL "$URL" | tar xz -C "$TMPDIR"
-          mkdir -p "$HOME/.local/bin"
-          mv "$TMPDIR/git-cliff-${GIT_CLIFF_VERSION}/git-cliff" "$HOME/.local/bin/git-cliff"
-          chmod +x "$HOME/.local/bin/git-cliff"
-          echo "$HOME/.local/bin" >> "$GITHUB_PATH"
-          "$HOME/.local/bin/git-cliff" --version
-      - name: Configure git
-        run: |
-          git config user.name "grm-ci-bot"
-          git config user.email "grm-ci-bot@oblachno.fyi"
-      - name: Run release
-        env:
-          PYTHONPATH: .
-        run: |
-          . .venv/bin/activate
-          python3 scripts/ci/release.py
-      - name: Notify on failure
-        if: failure()
-        env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
-          PYTHONPATH: .
-        run: |
-          . .venv/bin/activate
-          python3 scripts/ci/notify_failure.py \
-            --repo "${{ github.repository }}" \
-            --run-id "${{ github.run_id }}" \
-            --workflow "release" \
-            --commit "${{ github.sha }}"
@@ -1,31 +0,0 @@
-name: Sync Wiki
-
-on:
-  push:
-    branches: [master]
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  sync-wiki:
-    runs-on: docker
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up environment
-        run: make setup
-      - name: Sync documentation to wiki
-        env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
-          PYTHONPATH: src
-        run: |
-          . .venv/bin/activate
-          python3 scripts/ci/sync_wiki.py --repo "${{ github.repository }}" --strict
-      - name: Tag wiki on release
-        if: startsWith(github.ref, 'refs/tags/v')
-        env:
-          REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
-        run: |
-          echo "Release tag ${{ github.ref_name }} — wiki synced with release"