From 02e976fb8e2c0aed8e01ea13df2cffcb860a61e4 Mon Sep 17 00:00:00 2001
From: Ed Morley <501702+edmorley@users.noreply.github.com>
Date: Mon, 9 Oct 2023 13:03:28 +0000
Subject: [PATCH] Group minor/patch version Rust Dependabot updates into one PR
 (#596)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously only libcnb related dependency updates were grouped into
one Dependabot PR.

Now there is a second group, that takes advantage of Dependabot's new
semver version level grouping feature:
https://github.blog/changelog/2023-08-17-grouped-version-updates-by-semantic-version-level-for-dependabot/

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

GUS-W-14258249.
---
 .github/dependabot.yml                | 13 +++++++++++++
 .github/workflows/check_changelog.yml |  6 ++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5f44823a..32526d48 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,12 +4,25 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+    labels:
+      - "dependencies"
+      - "rust"
+      - "skip changelog"
     groups:
+      # Note: The group order matters, since updates are assigned to the first matching group.
       libcnb:
         patterns:
           - "libcnb*"
           - "libherokubuildpack"
+      rust-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 31f8745b..c0cc43b7 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