From 7e38e0cb2c7c27355dd9d355723106dda0308014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihai=20Capot=C4=83?= Date: Thu, 6 Aug 2026 17:20:39 -0700 Subject: [PATCH] Group Dependabot security updates; fix merge queue --- .github/dependabot.yml | 6 +++++- .github/workflows/cd.yml | 3 +++ .github/workflows/ci.yml | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0a475a6e..29fd9ace 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,10 @@ updates: schedule: interval: "weekly" groups: - all: + all-version-updates: + patterns: + - "*" + all-security-updates: + applies-to: security-updates patterns: - "*" diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index f59149fa..bbb41c3d 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -5,6 +5,9 @@ on: release: types: - published + merge_group: + paths: + - .github/workflows/cd.yml pull_request: paths: - .github/workflows/cd.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9f94ced..8f8ce084 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,9 @@ name: CI on: pull_request: + merge_group: push: + branches: [ "master" ] concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}