From 69a58e0b11a461c6b4d1bd9d685195b178358774 Mon Sep 17 00:00:00 2001 From: daz Date: Tue, 9 Apr 2024 22:04:44 -0600 Subject: [PATCH] Migrated dependency-submission workflows into tests --- .../workflows/dependency-submission-save.yml | 25 ------- .../dependency-submission-submit.yml | 23 ------- .github/workflows/dependency-submission.yml | 65 ------------------- .../integ-test-dependency-submission.yml | 43 +++++++++++- 4 files changed, 42 insertions(+), 114 deletions(-) delete mode 100644 .github/workflows/dependency-submission-save.yml delete mode 100644 .github/workflows/dependency-submission-submit.yml delete mode 100644 .github/workflows/dependency-submission.yml diff --git a/.github/workflows/dependency-submission-save.yml b/.github/workflows/dependency-submission-save.yml deleted file mode 100644 index 8d70dfa..0000000 --- a/.github/workflows/dependency-submission-save.yml +++ /dev/null @@ -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 diff --git a/.github/workflows/dependency-submission-submit.yml b/.github/workflows/dependency-submission-submit.yml deleted file mode 100644 index 021404e..0000000 --- a/.github/workflows/dependency-submission-submit.yml +++ /dev/null @@ -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 diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml deleted file mode 100644 index 3726777..0000000 --- a/.github/workflows/dependency-submission.yml +++ /dev/null @@ -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 diff --git a/.github/workflows/integ-test-dependency-submission.yml b/.github/workflows/integ-test-dependency-submission.yml index 9db76d8..a937679 100644 --- a/.github/workflows/integ-test-dependency-submission.yml +++ b/.github/workflows/integ-test-dependency-submission.yml @@ -194,4 +194,45 @@ 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 }} + env: + GITHUB_DEPENDENCY_GRAPH_REF: 'refs/tags/v0.0.1' # Use a different ref to avoid updating the real dependency graph for the repository + + 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