diff --git a/.github/actions/init-integ-test/action.yml b/.github/actions/init-integ-test/action.yml index 28e3bb51..4beb7cb5 100644 --- a/.github/actions/init-integ-test/action.yml +++ b/.github/actions/init-integ-test/action.yml @@ -4,7 +4,7 @@ inputs: java-version: description: 'Java version to use' required: false - default: '17' + default: '11' runs: using: "composite" diff --git a/.github/workflows/integ-test-provision-gradle-versions.yml b/.github/workflows/integ-test-provision-gradle-versions.yml index b8116e84..ff94fb30 100644 --- a/.github/workflows/integ-test-provision-gradle-versions.yml +++ b/.github/workflows/integ-test-provision-gradle-versions.yml @@ -36,8 +36,6 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Initialize integ-test uses: ./.github/actions/init-integ-test - with: - java-version: '17' # Gradle 9 requires Java 17+ to run - name: Setup Gradle with v6.9 uses: ./setup-gradle @@ -54,13 +52,6 @@ jobs: - name: Test uses Gradle v7.1.1 working-directory: .github/workflow-samples/no-wrapper run: gradle help "-DgradleVersionCheck=7.1.1" - - name: Setup Gradle with release-candidate - uses: ./setup-gradle - with: - gradle-version: release-candidate - - name: Test use release-candidate - working-directory: .github/workflow-samples/no-wrapper - run: gradle help - name: Setup Gradle with current id: gradle-current uses: ./setup-gradle @@ -75,6 +66,29 @@ jobs: with: script: | core.setFailed('Gradle version parameter not set correctly: value was "${{ steps.gradle-current.outputs.gradle-version }}"') + + provision-gradle-with-jdk-17: + strategy: + max-parallel: 1 + fail-fast: false + matrix: + os: ${{fromJSON(inputs.runner-os)}} + runs-on: ${{ matrix.os }} + steps: + - name: Checkout sources + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: Initialize integ-test + uses: ./.github/actions/init-integ-test + with: + java-version: '17' + + - name: Setup Gradle with release-candidate + uses: ./setup-gradle + with: + gradle-version: release-candidate + - name: Test use release-candidate + working-directory: .github/workflow-samples/no-wrapper + run: gradle help provision-gradle-version: strategy: