Consolidate 'dependency-submission' tests into integ-test workflow

.github/workflows/ci-dependency-review.yml

@@ -1,28 +0,0 @@
-# Dependency Review Action
-#
-# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
-#
-# Source repository: https://github.com/actions/dependency-review-action
-# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
-name: CI-dependency-review
-on: [pull_request]
-
-permissions:
-  contents: write
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout Repository'
-        uses: actions/checkout@v4
-      - name: Dependencies for groovy-dsl
-        uses: ./dependency-submission
-        with:
-          build-root-directory: .github/workflow-samples/groovy-dsl
-      - name: Dependencies for kotlin-dsl
-        uses: ./dependency-submission
-        with:
-          build-root-directory: .github/workflow-samples/kotlin-dsl
-      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v4

.github/workflows/dependency-submission-save.yml

@@ -1,25 +0,0 @@
-name: Test dependency-submission save
-
-on:
-  workflow_dispatch:
-  push:
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-submission-save:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-    - name: Initialize integ-test
-      uses: ./.github/actions/init-integ-test
-
-    - name: Generate and save dependency graph
-      uses: ./dependency-submission
-      with:
-        build-root-directory: .github/workflow-samples/groovy-dsl
-        dependency-graph: generate-and-upload
-      env:
-        GITHUB_DEPENDENCY_GRAPH_REF: 'refs/tags/v0.0.1' # Use a different ref to avoid updating the real dependency graph for the repository

.github/workflows/dependency-submission-submit.yml

@@ -1,23 +0,0 @@
-name: Test dependency-submission submit
-
-on:
-  workflow_run:
-    workflows: ['Test dependency-submission save']
-    types: [completed]
-
-permissions:
-  contents: write
-
-jobs:
-  dependency-submission-submit:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-    - name: Initialize integ-test
-      uses: ./.github/actions/init-integ-test
-
-    - name: Download and submit dependency graph
-      uses: ./dependency-submission
-      with:
-        dependency-graph: download-and-submit

.github/workflows/dependency-submission.yml

@@ -1,65 +0,0 @@
-name: Test dependency-submission
-
-on:
-  workflow_dispatch:
-  push:
-
-permissions:
-  contents: write
-
-jobs:
-  test-dependency-submission:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-    - name: Initialize integ-test
-      uses: ./.github/actions/init-integ-test
-
-    - name: Generate and submit dependencies
-      uses: ./dependency-submission
-      with:
-        build-root-directory: .github/workflow-samples/groovy-dsl
-      env:
-        GITHUB_DEPENDENCY_GRAPH_REF: 'refs/tags/v0.0.1' # Use a different ref to avoid updating the real dependency graph for the repository
-
-  test-gradle-versions:
-    strategy:
-      fail-fast: false
-      matrix:
-        gradle: [8.0.2, 7.6.4, 7.1.1, 6.9.4, 6.0.1, 5.6.4, 5.2.1]
-        include:
-          - gradle: 5.6.4
-            build-root-suffix: -gradle-5
-          - gradle: 5.2.1
-            build-root-suffix: -gradle-5
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-    - name: Initialize integ-test
-      uses: ./.github/actions/init-integ-test
-
-    - name: Generate and submit dependencies
-      uses: ./dependency-submission
-      with:
-        gradle-version: ${{ matrix.gradle }}
-        build-root-directory: .github/workflow-samples/no-wrapper${{ matrix.build-root-suffix }}
-      env:
-        GITHUB_DEPENDENCY_GRAPH_REF: 'refs/tags/v0.0.1' # Use a different ref to avoid updating the real dependency graph for the repository
-
-  test-after-setup-gradle:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-    - name: Initialize integ-test
-      uses: ./.github/actions/init-integ-test
-
-    - name: Setup Gradle
-      uses: ./setup-gradle
-    - name: Generate and submit dependencies
-      id: dependency-submission
-      uses: ./dependency-submission
-      with:
-        build-root-directory: .github/workflow-samples/groovy-dsl

.github/workflows/integ-test-dependency-submission.yml

@@ -18,6 +18,7 @@ permissions:
 env:
   DOWNLOAD_DIST: ${{ inputs.download-dist }}
   GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: dependency-graph-${{ inputs.cache-key-prefix }}
+  GITHUB_DEPENDENCY_GRAPH_REF: 'refs/tags/v0.0.1' # Use a fake ref to avoid updating the real dependency graph for the repository
 
 jobs:
   groovy-generate-and-upload:
@@ -194,4 +195,43 @@ jobs:
             echo "Expected no dependency graph files to be generated"
             ls -l dependency-graph-reports
             exit 1
-        fi        
+        fi
+
+  gradle-versions:
+    strategy:
+      fail-fast: false
+      matrix:
+        gradle: [8.0.2, 7.6.4, 7.1.1, 6.9.4, 6.0.1, 5.6.4, 5.2.1]
+        include:
+          - gradle: 5.6.4
+            build-root-suffix: -gradle-5
+          - gradle: 5.2.1
+            build-root-suffix: -gradle-5
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v4
+    - name: Initialize integ-test
+      uses: ./.github/actions/init-integ-test
+
+    - name: Generate and submit dependencies
+      uses: ./dependency-submission
+      with:
+        gradle-version: ${{ matrix.gradle }}
+        build-root-directory: .github/workflow-samples/no-wrapper${{ matrix.build-root-suffix }}
+
+  after-setup-gradle:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v4
+    - name: Initialize integ-test
+      uses: ./.github/actions/init-integ-test
+
+    - name: Setup Gradle
+      uses: ./setup-gradle
+    - name: Generate and submit dependencies
+      id: dependency-submission
+      uses: ./dependency-submission
+      with:
+        build-root-directory: .github/workflow-samples/groovy-dsl