From e209b889b81ec831f443afe46609dd22b4b4b2fe Mon Sep 17 00:00:00 2001
From: Eric Haag <ehaag@gradle.com>
Date: Mon, 4 Dec 2023 09:10:04 -0600
Subject: [PATCH] Submit dependency graph from development release workflow

---
 .github/workflows/development-release.yml     |  6 ++++
 .../submit-github-dependency-graph.yml        | 28 -------------------
 2 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/submit-github-dependency-graph.yml

diff --git a/.github/workflows/development-release.yml b/.github/workflows/development-release.yml
index 4ed3efd1..2074c297 100644
--- a/.github/workflows/development-release.yml
+++ b/.github/workflows/development-release.yml
@@ -6,6 +6,9 @@ on:
             - main
     workflow_dispatch:
 
+permissions:
+    contents: write
+
 jobs:
     development_release:
         name: Release
@@ -26,6 +29,8 @@ jobs:
                     distribution: 'liberica'
             -   name: Setup Gradle
                 uses: gradle/gradle-build-action@v2
+                with:
+                    dependency-graph: generate-and-submit
             -   name: Build and bundle plugin artifact
                 run: ./gradlew clean build -Porg.gradle.java.installations.fromEnv=JAVA_HOME_6_0_119_X64 -PjavaCompilerVersion=6
                 env:
@@ -36,6 +41,7 @@ jobs:
                 env:
                     TEAMCITY_PLUGIN_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                     GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+                    GITHUB_DEPENDENCY_GRAPH_ENABLED: false
             -   name: Upload plugin artifact
                 uses: actions/upload-artifact@v3
                 with:
diff --git a/.github/workflows/submit-github-dependency-graph.yml b/.github/workflows/submit-github-dependency-graph.yml
deleted file mode 100644
index aea307d9..00000000
--- a/.github/workflows/submit-github-dependency-graph.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Submit GitHub Dependency Graph
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-  
-permissions:
-  contents: write
-
-jobs:
-  generate-and-submit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
-      with:
-        distribution: liberica
-        java-version: 11
-    - name: Set up Gradle
-      uses: gradle/gradle-build-action@v2
-      with:
-        dependency-graph: generate-and-submit
-    - name: Run gradle to resolve dependencies
-      run: ./gradlew :GitHubDependencyGraphPlugin_generateDependencyGraph
-      env:
-        GRADLE_ENTERPRISE_TEST_INSTANCE: ${{ secrets.GE_ACCESS_TOKEN != null && 'https://etiennestuder.gradle-enterprise.cloud' || '' }}
-        GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN != null && secrets.GE_ACCESS_TOKEN || 'dummy.server=dummy_value' }}