From f5e46b0f7bb899267cfd5bd426565cffda0bd74a Mon Sep 17 00:00:00 2001 From: daz Date: Tue, 9 Apr 2024 23:51:33 -0600 Subject: [PATCH] More tests on PR --- .github/workflows/ci-quick-check.yml | 194 +++++++++--------- .../workflows/integ-test-action-inputs.yml | 2 +- 2 files changed, 99 insertions(+), 97 deletions(-) diff --git a/.github/workflows/ci-quick-check.yml b/.github/workflows/ci-quick-check.yml index 74c525f..01c512c 100644 --- a/.github/workflows/ci-quick-check.yml +++ b/.github/workflows/ci-quick-check.yml @@ -3,130 +3,132 @@ name: CI-quick-check on: workflow_dispatch: push: - branches-ignore: - - main - - release/** jobs: build-distribution: runs-on: ubuntu-latest + outputs: + runner-os: ${{ steps.PR.outputs.pr_found == 'true' && '["ubuntu-latest", "windows-latest", "macos-latest"]' || '["ubuntu-latest"]' }} steps: - name: Checkout sources uses: actions/checkout@v4 - name: Build and upload distribution uses: ./.github/actions/build-dist + - name: Check for current PR + uses: 8BitJonny/gh-get-current-pr@3.0.0 + id: PR action-inputs: needs: build-distribution uses: ./.github/workflows/integ-test-action-inputs.yml with: - runner-os: '["ubuntu-latest"]' + runner-os: ${{ needs.build-distribution.outputs.runner-os }} - cache-cleanup: - needs: build-distribution - uses: ./.github/workflows/integ-test-cache-cleanup.yml - with: - runner-os: '["ubuntu-latest"]' - cache-key-prefix: ${{github.run_number}}- # Requires a fresh cache entry each run + # cache-cleanup: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-cache-cleanup.yml + # with: + # runner-os: '["ubuntu-latest"]' + # cache-key-prefix: ${{github.run_number}}- # Requires a fresh cache entry each run - caching-config: - needs: build-distribution - uses: ./.github/workflows/integ-test-caching-config.yml - with: - runner-os: '["ubuntu-latest"]' + # caching-config: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-caching-config.yml + # with: + # runner-os: '["ubuntu-latest"]' - dependency-graph: - needs: build-distribution - uses: ./.github/workflows/integ-test-dependency-graph.yml - permissions: - contents: write - with: - runner-os: '["ubuntu-latest"]' + # dependency-graph: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-dependency-graph.yml + # permissions: + # contents: write + # with: + # runner-os: '["ubuntu-latest"]' - dependency-submission: - needs: build-distribution - uses: ./.github/workflows/integ-test-dependency-submission.yml - permissions: - contents: write - with: - runner-os: '["ubuntu-latest"]' + # dependency-submission: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-dependency-submission.yml + # permissions: + # contents: write + # with: + # runner-os: '["ubuntu-latest"]' - dependency-submission-failures: - needs: build-distribution - uses: ./.github/workflows/integ-test-dependency-submission-failures.yml - permissions: - contents: write - with: - runner-os: '["ubuntu-latest"]' + # dependency-submission-failures: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-dependency-submission-failures.yml + # permissions: + # contents: write + # with: + # runner-os: '["ubuntu-latest"]' - execution-with-caching: - needs: build-distribution - uses: ./.github/workflows/integ-test-execution-with-caching.yml - with: - runner-os: '["ubuntu-latest"]' + # execution-with-caching: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-execution-with-caching.yml + # with: + # runner-os: '["ubuntu-latest"]' - execution: - needs: build-distribution - uses: ./.github/workflows/integ-test-execution.yml - with: - runner-os: '["ubuntu-latest"]' + # execution: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-execution.yml + # with: + # runner-os: '["ubuntu-latest"]' - develocity-injection: - needs: build-distribution - uses: ./.github/workflows/integ-test-inject-develocity.yml - with: - runner-os: '["ubuntu-latest"]' - secrets: - DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }} + # develocity-injection: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-inject-develocity.yml + # with: + # runner-os: '["ubuntu-latest"]' + # secrets: + # DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }} - provision-gradle-versions: - needs: build-distribution - uses: ./.github/workflows/integ-test-provision-gradle-versions.yml - with: - runner-os: '["ubuntu-latest"]' + # provision-gradle-versions: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-provision-gradle-versions.yml + # with: + # runner-os: '["ubuntu-latest"]' - restore-configuration-cache: - needs: build-distribution - uses: ./.github/workflows/integ-test-restore-configuration-cache.yml - with: - runner-os: '["ubuntu-latest"]' - secrets: - GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + # restore-configuration-cache: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-restore-configuration-cache.yml + # with: + # runner-os: '["ubuntu-latest"]' + # 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 + # restore-containerized-gradle-home: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-restore-containerized-gradle-home.yml - restore-custom-gradle-home: - needs: build-distribution - uses: ./.github/workflows/integ-test-restore-custom-gradle-home.yml + # restore-custom-gradle-home: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-restore-custom-gradle-home.yml - restore-gradle-home: - needs: build-distribution - uses: ./.github/workflows/integ-test-restore-gradle-home.yml - with: - runner-os: '["ubuntu-latest"]' + # restore-gradle-home: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-restore-gradle-home.yml + # with: + # runner-os: '["ubuntu-latest"]' - restore-java-toolchain: - needs: build-distribution - uses: ./.github/workflows/integ-test-restore-java-toolchain.yml - with: - runner-os: '["ubuntu-latest"]' + # restore-java-toolchain: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-restore-java-toolchain.yml + # with: + # runner-os: '["ubuntu-latest"]' - sample-kotlin-dsl: - needs: build-distribution - uses: ./.github/workflows/integ-test-sample-kotlin-dsl.yml - with: - runner-os: '["ubuntu-latest"]' + # sample-kotlin-dsl: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-sample-kotlin-dsl.yml + # with: + # runner-os: '["ubuntu-latest"]' - sample-gradle-plugin: - needs: build-distribution - uses: ./.github/workflows/integ-test-sample-gradle-plugin.yml - with: - runner-os: '["ubuntu-latest"]' + # sample-gradle-plugin: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-sample-gradle-plugin.yml + # with: + # runner-os: '["ubuntu-latest"]' - toolchain-detection: - needs: build-distribution - uses: ./.github/workflows/integ-test-detect-java-toolchains.yml - with: - runner-os: '["ubuntu-latest"]' + # toolchain-detection: + # needs: build-distribution + # uses: ./.github/workflows/integ-test-detect-java-toolchains.yml + # with: + # runner-os: '["ubuntu-latest"]' diff --git a/.github/workflows/integ-test-action-inputs.yml b/.github/workflows/integ-test-action-inputs.yml index 841c573..9713410 100644 --- a/.github/workflows/integ-test-action-inputs.yml +++ b/.github/workflows/integ-test-action-inputs.yml @@ -7,7 +7,7 @@ on: type: string runner-os: type: string - default: '["ubuntu-latest", "windows-latest", "macos-latest"]' + required: true env: GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: action-inputs-${{ inputs.cache-key-prefix }}