From bbaece8fcdaa441f57b229b6c63d69b09a5d728c Mon Sep 17 00:00:00 2001
From: Ed Morley <501702+edmorley@users.noreply.github.com>
Date: Mon, 16 Oct 2023 13:32:22 +0000
Subject: [PATCH] Group minor/patch version Ruby Dependabot updates into one PR
 (#132)

Ruby minor/patch dependencies will now be grouped, using the new
Dependabot grouping feature:
https://github.blog/changelog/2023-08-17-grouped-version-updates-by-semantic-version-level-for-dependabot/

This hasn't been enabled for the GitHub Actions dependencies, since
they all use major pinning (since we only use the official actions
like `actions/checkout`).

In addition, the check changelog skipping strategy has been updated to
use the `skip changelog` label for (a) explicitness, (b) to allow removing
the label in situations where we realise a changelog entry is required,
(c) for consistency with other repos.

GUS-W-14303554.
---
 .github/dependabot.yml                | 7 +++++++
 .github/workflows/check_changelog.yml | 6 ++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5d7a569..6f7da74 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,11 +6,18 @@ updates:
       interval: "monthly"
     labels:
       - "dependencies"
+      - "ruby"
       - "skip changelog"
+    groups:
+      ruby-dependencies:
+        update-types:
+          - "minor"
+          - "patch"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "monthly"
     labels:
       - "dependencies"
+      - "github actions"
       - "skip changelog"
diff --git a/.github/workflows/check_changelog.yml b/.github/workflows/check_changelog.yml
index 31f8745..c0cc43b 100644
--- a/.github/workflows/check_changelog.yml
+++ b/.github/workflows/check_changelog.yml
@@ -9,10 +9,8 @@ permissions:
 
 jobs:
   check-changelog:
-    runs-on: ubuntu-22.04
-    if: |
-      !contains(github.event.pull_request.labels.*.name, 'skip changelog') &&
-      !contains(github.event.pull_request.labels.*.name, 'dependencies')
+    runs-on: ubuntu-latest
+    if: (!contains(github.event.pull_request.labels.*.name, 'skip changelog'))
     steps:
       - name: Checkout
         uses: actions/checkout@v4