From 14eca47871a53d7aadac1f54ed63b3b653ee55de Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Wed, 1 Jul 2026 13:55:22 -0400
Subject: [PATCH 1/3] Scope dependency caches to protected refs

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58fb26607a2..5f203b498cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -219,7 +219,6 @@ default:
         - .gradle/notifications
         - .mvn/caches
       policy: $DEPENDENCY_CACHE_POLICY
-      unprotect: true
       fallback_keys: # Use fallback keys because all cache types are not populated. See note under: populate_dep_cache
         - 'dependency-base'
         - 'dependency-lib'
@@ -771,7 +770,6 @@ muzzle-dep-report:
       fallback_keys:
         - dependency-base
         - dependency-lib
-      unprotect: true
   before_script:
     - git config --global --add safe.directory "$CI_PROJECT_DIR"
     # Akka token added to SSM from https://account.akka.io/token

From e6c4a4009c59f4117bb00b9573eaf971f6089091 Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Wed, 1 Jul 2026 14:57:44 -0400
Subject: [PATCH 2/3] Revert "Scope dependency caches to protected refs"

This reverts commit 14eca47871a53d7aadac1f54ed63b3b653ee55de.
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f203b498cb..58fb26607a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -219,6 +219,7 @@ default:
         - .gradle/notifications
         - .mvn/caches
       policy: $DEPENDENCY_CACHE_POLICY
+      unprotect: true
       fallback_keys: # Use fallback keys because all cache types are not populated. See note under: populate_dep_cache
         - 'dependency-base'
         - 'dependency-lib'
@@ -770,6 +771,7 @@ muzzle-dep-report:
       fallback_keys:
         - dependency-base
         - dependency-lib
+      unprotect: true
   before_script:
     - git config --global --add safe.directory "$CI_PROJECT_DIR"
     # Akka token added to SSM from https://account.akka.io/token

From 3d3de3a31118995a7007216fe8b6fd133bf63adc Mon Sep 17 00:00:00 2001
From: Sarah Chen <sarah.chen@datadoghq.com>
Date: Wed, 1 Jul 2026 14:58:52 -0400
Subject: [PATCH 3/3] Dont allow manual triggers for populate_dep_cache

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58fb26607a2..560a5a08c1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -388,8 +388,6 @@ populate_dep_cache:
   rules:
     - if: '$POPULATE_CACHE'
       when: on_success
-    - when: manual
-      allow_failure: true
   parallel:
     matrix:
       - GRADLE_TARGET: ":dd-java-agent:shadowJar :dd-trace-api:jar :dd-trace-ot:shadowJar"