From 8e0d84ae82b24c7e6244baae5ff5d6d5fb4377e8 Mon Sep 17 00:00:00 2001
From: Adam Novak <anovak@soe.ucsc.edu>
Date: Thu, 5 Dec 2024 14:28:14 -0500
Subject: [PATCH] Move rebase-strategy into each updates element (#5176)

* Move rebase-strategy into each updates element

* Validate the Dependabot config during CI linting
---
 .github/dependabot.yml | 8 +++++---
 .gitlab-ci.yml         | 1 +
 requirements-dev.txt   | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2e2dc52e1b..38a9f94531 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,3 +1,5 @@
+# Dependabot configuration file
+# Validate with: check-jsonschema --schemafile https://json.schemastore.org/dependabot-2.0.json .github/dependabot.yml
 version: 2
 updates:
   - package-ecosystem: "pip" # See documentation for possible values
@@ -11,11 +13,11 @@ updates:
       - dependency-name: "apache-libcloud"
       - dependency-name: "google-cloud-storage"
       - dependency-name: "google-auth"
+    rebase-strategy: disabled
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
-# Don't constantly rebase all the dependency bump PRs whenever anything else
-# merges; this causes too many CI runs.
-rebase-strategy: ignore
+    rebase-strategy: disabled
+    
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cea0017fb..768d755902 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,6 +71,7 @@ lint:
     - ${MAIN_PYTHON_PKG} --version
     - make mypy
     - make docs
+    - check-jsonschema --schemafile https://json.schemastore.org/dependabot-2.0.json .github/dependabot.yml
     # - make diff_pydocstyle_report
 
 cwl_dependency_is_stand_alone:
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 5c407889a6..502a908de4 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -31,3 +31,4 @@ docutils>=0.16,<0.22
 pyupgrade
 pytest-xdist
 build
+check-jsonschema