Avoid duplicate exposing of Gradle in settings-scope

bot-gradle · alllex · commit c3c31f7dcadd · 2025-09-15T21:06:38.000+02:00
diff --git a/.github/workflows/cleanup-stale-performance-data.yml b/.github/workflows/cleanup-stale-performance-data.yml
@@ -0,0 +1,62 @@
+name: Cleanup stale performance test data
+
+on:
+  schedule:
+    - cron: '0 4 * * 1'  # Run every Monday at 4:00 AM UTC
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  cleanup-stale-performance-data:
+    runs-on: ubuntu-latest
+
+    if: github.repository == 'gradle/gradle'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+      
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v5
+        with:
+          role-to-assume: arn:aws:iam::992382829881:role/GHASecrets_gradle_all
+          aws-region: "eu-central-1"
+      
+      - name: Get secrets
+        uses: aws-actions/aws-secretsmanager-get-secrets@v2
+        with:
+          secret-ids: |
+            PERFORMANCE_DB_URL, gha/gradle/_all/PERFORMANCE_DB_URL
+            PERFORMANCE_DB_USERNAME, gha/gradle/_all/PERFORMANCE_DB_USERNAME
+            PERFORMANCE_DB_PASSWORD_TCAGENT, gha/gradle/_all/PERFORMANCE_DB_PASSWORD
+      
+      - name: Extract database host from URL
+        run: |
+          # jdbc:mysql://gradle-bt-performance.xyz.eu-central-1.rds.amazonaws.com:3306 -> gradle-bt-performance.xyz.eu-central-1.rds.amazonaws.com
+          echo "DB_HOST=$(echo ${PERFORMANCE_DB_URL} | cut -d/ -f3 | cut -d: -f1)" >> $GITHUB_ENV
+      
+      - name: Clean up stale data and verify results
+        run: |
+          echo "Cleaning up stale data from both databases..."
+          docker run --rm mysql:latest mysql \
+            -u${{ env.PERFORMANCE_DB_USERNAME }} \
+            -p${{ env.PERFORMANCE_DB_PASSWORD_TCAGENT }} \
+            -h${{ env.DB_HOST }} \
+            -e '
+            USE results;
+            DELETE FROM testOperation WHERE testExecution IN (SELECT id FROM testExecution WHERE startTime < NOW() - INTERVAL 365 DAY);
+            DELETE FROM testExecution WHERE startTime < NOW() - INTERVAL 365 DAY;
+            SELECT "results.testExecution count:" as database_table, COUNT(*) as stale_records FROM testExecution WHERE startTime < NOW() - INTERVAL 365 DAY;
+            USE cross_build_results;
+            DELETE FROM testOperation WHERE testExecution IN (SELECT id FROM testExecution WHERE startTime < NOW() - INTERVAL 365 DAY);
+            DELETE FROM testExecution WHERE startTime < NOW() - INTERVAL 365 DAY;
+            SELECT "cross_build_results.testExecution count:" as database_table, COUNT(*) as stale_records FROM testExecution WHERE startTime < NOW() - INTERVAL 365 DAY;
+            '
+        
+      - name: Summary
+        run: |
+          echo "✅ Cleanup completed successfully"
+          echo "🗑️  Removed test data older than 365 days from both databases"
diff --git a/subprojects/core-api/src/main/java/org/gradle/api/invocation/Gradle.java b/subprojects/core-api/src/main/java/org/gradle/api/invocation/Gradle.java
@@ -46,7 +46,7 @@
  * <p>You can obtain a {@code Gradle} instance by calling {@link Project#getGradle()}.</p>
  */
 @HasInternalProtocol
-@ServiceScope(Scope.Gradle.class)
+@ServiceScope(Scope.Build.class)
 public interface Gradle extends PluginAware, ExtensionAware {
 
     /**
diff --git a/subprojects/core/src/main/java/org/gradle/api/internal/GradleInternal.java b/subprojects/core/src/main/java/org/gradle/api/internal/GradleInternal.java
@@ -43,7 +43,7 @@
  * consumption.
  */
 @UsedByScanPlugin
-@ServiceScope({Scope.Build.class, Scope.Settings.class})
+@ServiceScope(Scope.Build.class)
 public interface GradleInternal extends Gradle, PluginAwareInternal {
     /**
      * {@inheritDoc}
diff --git a/subprojects/core/src/main/java/org/gradle/internal/service/scopes/SettingsScopeServices.java b/subprojects/core/src/main/java/org/gradle/internal/service/scopes/SettingsScopeServices.java
@@ -121,11 +121,6 @@ protected ConfigurationTargetIdentifier createConfigurationTargetIdentifier() {
         return ConfigurationTargetIdentifier.of(settings);
     }
 
-    @Provides
-    protected GradleInternal createGradleInternal() {
-        return settings.getGradle();
-    }
-
     @Provides
     protected CacheConfigurationsInternal createCacheConfigurations(ObjectFactory objectFactory, CacheConfigurationsInternal persistentCacheConfigurations, GradleInternal gradleInternal) {
         CacheConfigurationsInternal cacheConfigurations = objectFactory.newInstance(DefaultCacheConfigurations.class);
