From 38db84473246423b8477c76e5747eb459c95060f Mon Sep 17 00:00:00 2001
From: Juanpe Araque <juanpedro.araque@datadoghq.com>
Date: Mon, 26 May 2025 14:12:41 +0200
Subject: [PATCH 1/4] Bump version of datadog-checks-dev and update tag-release
 to use new fetch feature

---
 .gitlab/tagger/tag-release.sh | 6 ++++++
 ddev/pyproject.toml           | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab/tagger/tag-release.sh b/.gitlab/tagger/tag-release.sh
index 42da3cbcfddb3..e95b1c6023983 100755
--- a/.gitlab/tagger/tag-release.sh
+++ b/.gitlab/tagger/tag-release.sh
@@ -16,6 +16,12 @@ git config --global user.name "$TAGGER_NAME"
 set +e
 ddev release tag all --skip-prerelease
 status=$?
+# If we fail to fetch tags, fallback to the old behavior of getting list of tags even if they're not fetched
+if [[ $status -eq 3 ]]; then
+    echo "Failed to fetch tags, falling back to list tags without fetching"
+    ddev release tag all --skip-prerelease --no-fetch
+    status=$?
+fi
 set -e
 
 # Only build packages if there were new releases
diff --git a/ddev/pyproject.toml b/ddev/pyproject.toml
index 78378e34e80de..14ece7cb48e17 100644
--- a/ddev/pyproject.toml
+++ b/ddev/pyproject.toml
@@ -29,7 +29,7 @@ dependencies = [
     "click~=8.1.6",
     "coverage",
     "datadog-api-client==2.20.0",
-    "datadog-checks-dev[cli]~=35.0",
+    "datadog-checks-dev[cli]~=35.1",
     "hatch>=1.8.1",
     "httpx",
     "jsonpointer",

From 8ed652d82b479e1bfde8369cd9a2ba99277629bf Mon Sep 17 00:00:00 2001
From: Juanpe Araque <juanpedro.araque@datadoghq.com>
Date: Mon, 26 May 2025 14:43:20 +0200
Subject: [PATCH 2/4] Add changelog

---
 ddev/changelog.d/20370.added | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 ddev/changelog.d/20370.added

diff --git a/ddev/changelog.d/20370.added b/ddev/changelog.d/20370.added
new file mode 100644
index 0000000000000..faec6f50b17b2
--- /dev/null
+++ b/ddev/changelog.d/20370.added
@@ -0,0 +1 @@
+Bump datadog-checks-dev version to 35.1
\ No newline at end of file

From 3603734f56df3a2fbdc238e6b9c9dd4b879a4d73 Mon Sep 17 00:00:00 2001
From: Juanpe Araque <juanpedro.araque@datadoghq.com>
Date: Tue, 27 May 2025 12:20:23 +0200
Subject: [PATCH 3/4] Fix docker build in GitLab pipeline to ensure only builds
 in master when there are changes

---
 .gitlab-ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfe1419cf349f..757b3a0a226c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,8 +134,7 @@ tagger-image-builder:
     - if: $CI_COMMIT_TAG
       when: never
     - if: $CI_COMMIT_BRANCH == 'master'
-      when: always
-    - changes:
+      changes:
         - .gitlab/tagger/**/*
         - ddev/**/*
         - .gitlab-ci.yml
@@ -155,8 +154,7 @@ validate-log-intgs-builder:
     - if: $CI_COMMIT_TAG
       when: never
     - if: $CI_COMMIT_BRANCH == 'master'
-      when: always
-    - changes:
+      changes:
         - .gitlab/validate-logs-intgs/**/*
         - .gitlab-ci.yml
   script:

From e82f580db554abea59ec64b5a4f52437bcfe30ae Mon Sep 17 00:00:00 2001
From: Juanpe Araque <juanpedro.araque@datadoghq.com>
Date: Tue, 27 May 2025 12:31:56 +0200
Subject: [PATCH 4/4] Undo change on gitlab file, will move it to a separate pr

---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 757b3a0a226c2..cfe1419cf349f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,7 +134,8 @@ tagger-image-builder:
     - if: $CI_COMMIT_TAG
       when: never
     - if: $CI_COMMIT_BRANCH == 'master'
-      changes:
+      when: always
+    - changes:
         - .gitlab/tagger/**/*
         - ddev/**/*
         - .gitlab-ci.yml
@@ -154,7 +155,8 @@ validate-log-intgs-builder:
     - if: $CI_COMMIT_TAG
       when: never
     - if: $CI_COMMIT_BRANCH == 'master'
-      changes:
+      when: always
+    - changes:
         - .gitlab/validate-logs-intgs/**/*
         - .gitlab-ci.yml
   script: