From 2801c3a1296f5febbdb6c125eefe87652cd8e345 Mon Sep 17 00:00:00 2001 From: daz Date: Tue, 9 Apr 2024 23:01:34 -0600 Subject: [PATCH] Build dist for full-check --- .github/actions/init-integ-test/action.yml | 4 +-- .github/workflows/ci-full-check.yml | 30 +++++++++++++++++-- .github/workflows/ci-quick-check.yml | 23 ++------------ .../workflows/integ-test-action-inputs.yml | 4 --- .../workflows/integ-test-cache-cleanup.yml | 4 --- .../workflows/integ-test-caching-config.yml | 4 --- .../workflows/integ-test-dependency-graph.yml | 4 --- ...eg-test-dependency-submission-failures.yml | 4 --- .../integ-test-dependency-submission.yml | 4 --- .../integ-test-detect-java-toolchains.yml | 4 --- .../integ-test-execution-with-caching.yml | 4 --- .github/workflows/integ-test-execution.yml | 4 --- .../integ-test-inject-develocity.yml | 4 --- .../integ-test-provision-gradle-versions.yml | 4 --- ...integ-test-restore-configuration-cache.yml | 4 --- ...test-restore-containerized-gradle-home.yml | 4 --- .../integ-test-restore-custom-gradle-home.yml | 4 --- .../integ-test-restore-gradle-home.yml | 4 --- .../integ-test-restore-java-toolchain.yml | 4 --- .../integ-test-sample-gradle-plugin.yml | 4 --- .../integ-test-sample-kotlin-dsl.yml | 4 --- 21 files changed, 32 insertions(+), 97 deletions(-) diff --git a/.github/actions/init-integ-test/action.yml b/.github/actions/init-integ-test/action.yml index 8cf3f0c..8124f3e 100644 --- a/.github/actions/init-integ-test/action.yml +++ b/.github/actions/init-integ-test/action.yml @@ -9,10 +9,8 @@ runs: distribution: 'temurin' java-version: 11 - # Downloads a 'dist' directory artifact that was uploaded in an earlier step - # We control this with an environment variable to allow for easier global configuration. + # Downloads a 'dist' directory artifact that was uploaded in an earlier 'build-dist' step - name: Download dist - if: ${{ env.DOWNLOAD_DIST == 'true' }} uses: actions/download-artifact@v4 with: name: dist diff --git a/.github/workflows/ci-full-check.yml b/.github/workflows/ci-full-check.yml index b4f8e2e..ca44a3b 100644 --- a/.github/workflows/ci-full-check.yml +++ b/.github/workflows/ci-full-check.yml @@ -6,26 +6,38 @@ on: branches: - main - release/** - paths: - - 'dist/**' + pull_request: + types: [assigned] jobs: + build-distribution: + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v4 + - name: Build and upload distribution + uses: ./.github/actions/build-dist + action-inputs: + needs: build-distribution uses: ./.github/workflows/integ-test-action-inputs.yml with: cache-key-prefix: ${{github.run_number}}- cache-cleanup: + needs: build-distribution uses: ./.github/workflows/integ-test-cache-cleanup.yml with: cache-key-prefix: ${{github.run_number}}- caching-config: + needs: build-distribution uses: ./.github/workflows/integ-test-caching-config.yml with: cache-key-prefix: ${{github.run_number}}- dependency-graph: + needs: build-distribution uses: ./.github/workflows/integ-test-dependency-graph.yml permissions: contents: write @@ -33,6 +45,7 @@ jobs: cache-key-prefix: ${{github.run_number}}- dependency-submission: + needs: build-distribution uses: ./.github/workflows/integ-test-dependency-submission.yml permissions: contents: write @@ -40,21 +53,25 @@ jobs: cache-key-prefix: ${{github.run_number}}- dependency-submission-failures: + needs: build-distribution uses: ./.github/workflows/integ-test-dependency-submission-failures.yml with: cache-key-prefix: ${{github.run_number}}- execution-with-caching: + needs: build-distribution uses: ./.github/workflows/integ-test-execution-with-caching.yml with: cache-key-prefix: ${{github.run_number}}- execution: + needs: build-distribution uses: ./.github/workflows/integ-test-execution.yml with: cache-key-prefix: ${{github.run_number}}- develocity-injection: + needs: build-distribution uses: ./.github/workflows/integ-test-inject-develocity.yml with: cache-key-prefix: ${{github.run_number}}- @@ -62,11 +79,13 @@ jobs: DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }} provision-gradle-versions: + needs: build-distribution uses: ./.github/workflows/integ-test-provision-gradle-versions.yml with: cache-key-prefix: ${{github.run_number}}- restore-configuration-cache: + needs: build-distribution uses: ./.github/workflows/integ-test-restore-configuration-cache.yml with: cache-key-prefix: ${{github.run_number}}- @@ -74,36 +93,43 @@ jobs: GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} restore-custom-gradle-home: + needs: build-distribution uses: ./.github/workflows/integ-test-restore-custom-gradle-home.yml with: cache-key-prefix: ${{github.run_number}}- restore-containerized-gradle-home: + needs: build-distribution uses: ./.github/workflows/integ-test-restore-containerized-gradle-home.yml with: cache-key-prefix: ${{github.run_number}}- restore-gradle-home: + needs: build-distribution uses: ./.github/workflows/integ-test-restore-gradle-home.yml with: cache-key-prefix: ${{github.run_number}}- restore-java-toolchain: + needs: build-distribution uses: ./.github/workflows/integ-test-restore-java-toolchain.yml with: cache-key-prefix: ${{github.run_number}}- sample-kotlin-dsl: + needs: build-distribution uses: ./.github/workflows/integ-test-sample-kotlin-dsl.yml with: cache-key-prefix: ${{github.run_number}}- sample-gradle-plugin: + needs: build-distribution uses: ./.github/workflows/integ-test-sample-gradle-plugin.yml with: cache-key-prefix: ${{github.run_number}}- toolchain-detection: + needs: build-distribution uses: ./.github/workflows/integ-test-detect-java-toolchains.yml with: cache-key-prefix: ${{github.run_number}}- diff --git a/.github/workflows/ci-quick-check.yml b/.github/workflows/ci-quick-check.yml index bcd682a..74c525f 100644 --- a/.github/workflows/ci-quick-check.yml +++ b/.github/workflows/ci-quick-check.yml @@ -3,6 +3,9 @@ name: CI-quick-check on: workflow_dispatch: push: + branches-ignore: + - main + - release/** jobs: build-distribution: @@ -18,14 +21,12 @@ jobs: uses: ./.github/workflows/integ-test-action-inputs.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true cache-cleanup: needs: build-distribution uses: ./.github/workflows/integ-test-cache-cleanup.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true cache-key-prefix: ${{github.run_number}}- # Requires a fresh cache entry each run caching-config: @@ -33,7 +34,6 @@ jobs: uses: ./.github/workflows/integ-test-caching-config.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true dependency-graph: needs: build-distribution @@ -42,7 +42,6 @@ jobs: contents: write with: runner-os: '["ubuntu-latest"]' - download-dist: true dependency-submission: needs: build-distribution @@ -51,7 +50,6 @@ jobs: contents: write with: runner-os: '["ubuntu-latest"]' - download-dist: true dependency-submission-failures: needs: build-distribution @@ -60,28 +58,24 @@ jobs: contents: write with: runner-os: '["ubuntu-latest"]' - download-dist: true execution-with-caching: needs: build-distribution uses: ./.github/workflows/integ-test-execution-with-caching.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true execution: needs: build-distribution uses: ./.github/workflows/integ-test-execution.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true develocity-injection: needs: build-distribution uses: ./.github/workflows/integ-test-inject-develocity.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true secrets: DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }} @@ -90,60 +84,49 @@ jobs: uses: ./.github/workflows/integ-test-provision-gradle-versions.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true restore-configuration-cache: needs: build-distribution uses: ./.github/workflows/integ-test-restore-configuration-cache.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true secrets: GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} restore-containerized-gradle-home: needs: build-distribution uses: ./.github/workflows/integ-test-restore-containerized-gradle-home.yml - with: - download-dist: true restore-custom-gradle-home: needs: build-distribution uses: ./.github/workflows/integ-test-restore-custom-gradle-home.yml - with: - download-dist: true restore-gradle-home: needs: build-distribution uses: ./.github/workflows/integ-test-restore-gradle-home.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true restore-java-toolchain: needs: build-distribution uses: ./.github/workflows/integ-test-restore-java-toolchain.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true sample-kotlin-dsl: needs: build-distribution uses: ./.github/workflows/integ-test-sample-kotlin-dsl.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true sample-gradle-plugin: needs: build-distribution uses: ./.github/workflows/integ-test-sample-gradle-plugin.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true toolchain-detection: needs: build-distribution uses: ./.github/workflows/integ-test-detect-java-toolchains.yml with: runner-os: '["ubuntu-latest"]' - download-dist: true diff --git a/.github/workflows/integ-test-action-inputs.yml b/.github/workflows/integ-test-action-inputs.yml index 81c46f2..841c573 100644 --- a/.github/workflows/integ-test-action-inputs.yml +++ b/.github/workflows/integ-test-action-inputs.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: action-inputs-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-cache-cleanup.yml b/.github/workflows/integ-test-cache-cleanup.yml index d14c98c..575af8b 100644 --- a/.github/workflows/integ-test-cache-cleanup.yml +++ b/.github/workflows/integ-test-cache-cleanup.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: integ-test-cache-cleanup-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-caching-config.yml b/.github/workflows/integ-test-caching-config.yml index a771b1d..cec3ef8 100644 --- a/.github/workflows/integ-test-caching-config.yml +++ b/.github/workflows/integ-test-caching-config.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: action-inputs-caching-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-dependency-graph.yml b/.github/workflows/integ-test-dependency-graph.yml index 8885735..481f89a 100644 --- a/.github/workflows/integ-test-dependency-graph.yml +++ b/.github/workflows/integ-test-dependency-graph.yml @@ -8,15 +8,11 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false permissions: contents: write env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: dependency-graph-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-dependency-submission-failures.yml b/.github/workflows/integ-test-dependency-submission-failures.yml index ac5e7dd..05246e4 100644 --- a/.github/workflows/integ-test-dependency-submission-failures.yml +++ b/.github/workflows/integ-test-dependency-submission-failures.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: dependency-graph-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-dependency-submission.yml b/.github/workflows/integ-test-dependency-submission.yml index a937679..68b8598 100644 --- a/.github/workflows/integ-test-dependency-submission.yml +++ b/.github/workflows/integ-test-dependency-submission.yml @@ -8,15 +8,11 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false permissions: contents: write env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: dependency-graph-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-detect-java-toolchains.yml b/.github/workflows/integ-test-detect-java-toolchains.yml index d08ba8b..f01f93b 100644 --- a/.github/workflows/integ-test-detect-java-toolchains.yml +++ b/.github/workflows/integ-test-detect-java-toolchains.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: detect-java-toolchain-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-execution-with-caching.yml b/.github/workflows/integ-test-execution-with-caching.yml index 08b26cd..f348be4 100644 --- a/.github/workflows/integ-test-execution-with-caching.yml +++ b/.github/workflows/integ-test-execution-with-caching.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: execution-with-caching-${{ inputs.cache-key-prefix }} GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true diff --git a/.github/workflows/integ-test-execution.yml b/.github/workflows/integ-test-execution.yml index 9cafa29..0fe6a06 100644 --- a/.github/workflows/integ-test-execution.yml +++ b/.github/workflows/integ-test-execution.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: execution-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-inject-develocity.yml b/.github/workflows/integ-test-inject-develocity.yml index 75c1ed2..43eccad 100644 --- a/.github/workflows/integ-test-inject-develocity.yml +++ b/.github/workflows/integ-test-inject-develocity.yml @@ -8,15 +8,11 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false secrets: DEVELOCITY_ACCESS_KEY: required: true env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: provision-gradle-versions-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-provision-gradle-versions.yml b/.github/workflows/integ-test-provision-gradle-versions.yml index 61a5a8b..9024f6b 100644 --- a/.github/workflows/integ-test-provision-gradle-versions.yml +++ b/.github/workflows/integ-test-provision-gradle-versions.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: provision-gradle-versions-${{ inputs.cache-key-prefix }} GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true diff --git a/.github/workflows/integ-test-restore-configuration-cache.yml b/.github/workflows/integ-test-restore-configuration-cache.yml index 7e75ea7..1750ae6 100644 --- a/.github/workflows/integ-test-restore-configuration-cache.yml +++ b/.github/workflows/integ-test-restore-configuration-cache.yml @@ -8,15 +8,11 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false secrets: GRADLE_ENCRYPTION_KEY: required: true env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: restore-configuration-cache-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-restore-containerized-gradle-home.yml b/.github/workflows/integ-test-restore-containerized-gradle-home.yml index 4a177ec..a485494 100644 --- a/.github/workflows/integ-test-restore-containerized-gradle-home.yml +++ b/.github/workflows/integ-test-restore-containerized-gradle-home.yml @@ -5,12 +5,8 @@ on: inputs: cache-key-prefix: type: string - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: restore-custom-gradle-home-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-restore-custom-gradle-home.yml b/.github/workflows/integ-test-restore-custom-gradle-home.yml index 3ebe4ee..f07131d 100644 --- a/.github/workflows/integ-test-restore-custom-gradle-home.yml +++ b/.github/workflows/integ-test-restore-custom-gradle-home.yml @@ -5,12 +5,8 @@ on: inputs: cache-key-prefix: type: string - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: restore-custom-gradle-home-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-restore-gradle-home.yml b/.github/workflows/integ-test-restore-gradle-home.yml index 63527a2..0d3ce72 100644 --- a/.github/workflows/integ-test-restore-gradle-home.yml +++ b/.github/workflows/integ-test-restore-gradle-home.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: restore-gradle-home-${{ inputs.cache-key-prefix }} GRADLE_BUILD_ACTION_CACHE_KEY_JOB: restore-gradle-home diff --git a/.github/workflows/integ-test-restore-java-toolchain.yml b/.github/workflows/integ-test-restore-java-toolchain.yml index 43421d2..cd4f82c 100644 --- a/.github/workflows/integ-test-restore-java-toolchain.yml +++ b/.github/workflows/integ-test-restore-java-toolchain.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: restore-java-toolchain-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-sample-gradle-plugin.yml b/.github/workflows/integ-test-sample-gradle-plugin.yml index 9a44b4b..a44d728 100644 --- a/.github/workflows/integ-test-sample-gradle-plugin.yml +++ b/.github/workflows/integ-test-sample-gradle-plugin.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: sample-gradle-plugin-${{ inputs.cache-key-prefix }} jobs: diff --git a/.github/workflows/integ-test-sample-kotlin-dsl.yml b/.github/workflows/integ-test-sample-kotlin-dsl.yml index d3e92f9..ecacb14 100644 --- a/.github/workflows/integ-test-sample-kotlin-dsl.yml +++ b/.github/workflows/integ-test-sample-kotlin-dsl.yml @@ -8,12 +8,8 @@ on: runner-os: type: string default: '["ubuntu-latest", "windows-latest", "macos-latest"]' - download-dist: - type: boolean - default: false env: - DOWNLOAD_DIST: ${{ inputs.download-dist }} GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: sample-kotlin-dsl-${{ inputs.cache-key-prefix }} jobs: