From 1786868a50573be1b0798a29054b5776ffb4e8ec Mon Sep 17 00:00:00 2001 From: Rasmus Rendal Date: Mon, 22 Jun 2026 12:33:49 +0200 Subject: [PATCH] fix: Also run prek job on workqueue On some repositories with much activity, we use the GitHub Actions merge groups. But when required jobs aren't set to run in the merge group, this will just make the whole pipeline stand still. This affects our development velocity adversely. --- .config/filegen-manifest.json | 2 +- .github/workflows/check-pre-commit-hooks.yml | 1 + nix/general/workflows/check-pre-commit-hooks.nix | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/filegen-manifest.json b/.config/filegen-manifest.json index 5a4fc9e..715da83 100644 --- a/.config/filegen-manifest.json +++ b/.config/filegen-manifest.json @@ -15,7 +15,7 @@ "deactivate": null, "ignore-modification": null, "permissions": "600", - "source": "/nix/store/yw3vsh26id80w6bivi9v4x3b835b4r5j-check-pre-commit-hooks.yml", + "source": "/nix/store/wyggpw11mkdvbcgbqzs80py8z8khjk9i-check-pre-commit-hooks.yml", "target": "./.github/workflows/check-pre-commit-hooks.yml", "type": "copy" }, diff --git a/.github/workflows/check-pre-commit-hooks.yml b/.github/workflows/check-pre-commit-hooks.yml index f5477fd..444070e 100644 --- a/.github/workflows/check-pre-commit-hooks.yml +++ b/.github/workflows/check-pre-commit-hooks.yml @@ -14,6 +14,7 @@ jobs: shell: nix develop .#standards --command bash {0} name: Make sure all pre-commit hooks pass "on": + merge_group: {} pull_request: branches: - '**' diff --git a/nix/general/workflows/check-pre-commit-hooks.nix b/nix/general/workflows/check-pre-commit-hooks.nix index 0cec5e4..28b887e 100644 --- a/nix/general/workflows/check-pre-commit-hooks.nix +++ b/nix/general/workflows/check-pre-commit-hooks.nix @@ -21,6 +21,7 @@ in "ready_for_review" ]; }; + on.mergeGroup = { }; concurrency = { group = "\${{ github.workflow }}-\${{ github.ref }}";