From 57ac8e6391373e0697766df5773d9c2a301ad87f Mon Sep 17 00:00:00 2001 From: hazre Date: Fri, 13 Mar 2026 17:32:21 +0100 Subject: [PATCH 1/2] ci: disable quality checks and changeset workflows on release pr --- .github/workflows/quality-checks.yml | 4 ++++ .github/workflows/require-changeset.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 811c83a98..50f4a19be 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -9,6 +9,7 @@ jobs: format: name: Format check runs-on: ubuntu-latest + if: github.head_ref != 'release' permissions: contents: read steps: @@ -26,6 +27,7 @@ jobs: lint: name: Lint runs-on: ubuntu-latest + if: github.head_ref != 'release' permissions: contents: read steps: @@ -43,6 +45,7 @@ jobs: typecheck: name: Typecheck runs-on: ubuntu-latest + if: github.head_ref != 'release' permissions: contents: read steps: @@ -60,6 +63,7 @@ jobs: knip: name: Knip runs-on: ubuntu-latest + if: github.head_ref != 'release' permissions: contents: read steps: diff --git a/.github/workflows/require-changeset.yml b/.github/workflows/require-changeset.yml index d01286639..30f881207 100644 --- a/.github/workflows/require-changeset.yml +++ b/.github/workflows/require-changeset.yml @@ -10,6 +10,7 @@ permissions: {} jobs: require-changeset: runs-on: ubuntu-latest + if: github.head_ref != 'release' permissions: contents: read pull-requests: write From 721a2064ec5679158674e56dac1133f07afebbe5 Mon Sep 17 00:00:00 2001 From: hazre Date: Fri, 13 Mar 2026 17:37:15 +0100 Subject: [PATCH 2/2] ci: add merge queue support --- .github/dependabot.yml | 2 +- .github/workflows/cloudflare-web-preview.yml | 2 +- .github/workflows/docker-publish.yml | 2 +- .github/workflows/quality-checks.yml | 18 ++++++++++++++++++ .github/workflows/require-changeset.yml | 3 ++- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e6ba80eef..848674637 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -36,7 +36,7 @@ updates: - package-ecosystem: npm cooldown: - default-days: 1 + default-days: 7 directory: / schedule: interval: daily diff --git a/.github/workflows/cloudflare-web-preview.yml b/.github/workflows/cloudflare-web-preview.yml index 892fd8eab..5ddfe5a0e 100644 --- a/.github/workflows/cloudflare-web-preview.yml +++ b/.github/workflows/cloudflare-web-preview.yml @@ -66,7 +66,7 @@ jobs: if [ "${{ github.event_name }}" = "pull_request" ]; then echo "alias=pr-${{ github.event.pull_request.number }}" >> "$GITHUB_OUTPUT" else - branch="${{ github.ref_name }}" + branch="${GITHUB_REF_NAME}" alias="$(echo "$branch" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/-\+/-/g' | sed 's/^-\|-$//g')" echo "alias=${alias}" >> "$GITHUB_OUTPUT" fi diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index f977ee2f6..b5f9bff29 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -4,7 +4,7 @@ on: push: branches: [dev] tags: - - 'sable/v*' + - 'v*' pull_request: paths: - 'Dockerfile' diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 50f4a19be..6928af6ea 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -4,6 +4,7 @@ on: pull_request: push: branches: [dev] + merge_group: jobs: format: @@ -77,3 +78,20 @@ jobs: - name: Run Knip run: pnpm run knip + + build: + name: Build + runs-on: ubuntu-latest + if: github.head_ref != 'release' + permissions: + contents: read + steps: + - name: Checkout repository + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + with: + persist-credentials: false + + - name: Setup app and build + uses: ./.github/actions/setup + with: + build: 'true' diff --git a/.github/workflows/require-changeset.yml b/.github/workflows/require-changeset.yml index 30f881207..17dfda277 100644 --- a/.github/workflows/require-changeset.yml +++ b/.github/workflows/require-changeset.yml @@ -3,6 +3,7 @@ name: Require Changeset on: pull_request: types: [opened, synchronize, reopened, labeled, unlabeled] + merge_group: branches: [dev] permissions: {} @@ -10,7 +11,7 @@ permissions: {} jobs: require-changeset: runs-on: ubuntu-latest - if: github.head_ref != 'release' + if: github.head_ref != 'release' && github.event_name != 'merge_group' permissions: contents: read pull-requests: write