mirror of
https://github.com/gradle/actions.git
synced 2026-08-17 11:22:50 +00:00
Consolidates seven open bot PRs into three commits. ## 1. Bump Gradle Wrapper from 9.5.1 to 9.6.1 Combines **#1008, #1009, #1010, #1011, #1012** into a single commit. Each of those PRs bumped the wrapper in one directory; this covers all five (15 files): - `sources/test/init-scripts` - `.github/workflow-samples/gradle-plugin` - `.github/workflow-samples/groovy-dsl` - `.github/workflow-samples/java-toolchain` - `.github/workflow-samples/kotlin-dsl` Each location gets the same `distributionUrl` → `gradle-9.6.1-bin.zip` and `distributionSha256Sum` update, plus the regenerated `gradlew` / `gradlew.bat` scripts. ## 2. Update known wrapper checksums **#990**, unchanged, as its own commit. Adds 36 checksum entries to `sources/src/wrapper-validation/wrapper-checksums.json`, **including the 9.6.1 checksums** — which is what lets the wrapper bump above pass `CI-validate-wrappers`. These two are worth landing together. ## 3. Bump Develocity Gradle plugin from 4.4.2 to 4.5.0 **#1015**, unchanged, as its own commit. Updates the plugin reference across workflow samples, init-script tests, docs, and the injected default in `sources/src/develocity/build-scan.ts`: ```diff -maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.4.2') +maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.5.0') ``` Since this touches `sources/src`, the bundled `dist/` will change when the update-dist bot runs. ## Verification All three cherry-picks applied without conflicts. On the combined branch: - `./build` — clean - `npm run check` (prettier + eslint) — clean - `npm test` — 373 tests, 15 suites, all passing Original bot authorship is preserved on all three commits. ## Superseded PRs Once this merges, these can be closed: #1008, #1009, #1010, #1011, #1012, #990, #1015. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-authored-by: bot-githubaction <bot-githubaction@gradle.com>
232 lines
8.7 KiB
YAML
232 lines
8.7 KiB
YAML
name: Test develocity injection
|
|
|
|
on:
|
|
workflow_call:
|
|
inputs:
|
|
cache-key-prefix:
|
|
type: string
|
|
default: '0'
|
|
runner-os:
|
|
type: string
|
|
default: '["ubuntu-latest"]'
|
|
skip-dist:
|
|
type: boolean
|
|
default: false
|
|
secrets:
|
|
DEVELOCITY_ACCESS_KEY:
|
|
required: true
|
|
|
|
env:
|
|
SKIP_DIST: ${{ inputs.skip-dist }}
|
|
GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: inject-develocity-${{ inputs.cache-key-prefix }}
|
|
|
|
permissions:
|
|
contents: read
|
|
|
|
jobs:
|
|
inject-develocity:
|
|
strategy:
|
|
fail-fast: false
|
|
matrix:
|
|
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
|
|
os: ${{fromJSON(inputs.runner-os)}}
|
|
plugin-version: ['3.16.2', '4.5.0']
|
|
include:
|
|
- java-version: 17
|
|
- gradle: '8.14.3'
|
|
java-version: 11
|
|
- gradle: '7.6.2'
|
|
java-version: 11
|
|
- gradle: '6.9.4'
|
|
java-version: 11
|
|
- gradle: '5.6.4'
|
|
java-version: 11
|
|
- plugin-version: '3.16.2'
|
|
accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
|
|
- plugin-version: '4.5.0'
|
|
accessKeyEnv: DEVELOCITY_ACCESS_KEY
|
|
runs-on: ${{ matrix.os }}
|
|
env:
|
|
DEVELOCITY_INJECTION_ENABLED: true
|
|
DEVELOCITY_INJECTION_URL: https://ge.solutions-team.gradle.com
|
|
DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION: ${{ matrix.plugin-version }}
|
|
DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION: '2.2.1'
|
|
${{matrix.accessKeyEnv}}: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
|
|
|
|
steps:
|
|
- name: Checkout sources
|
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
|
- name: Initialize integ-test
|
|
uses: ./.github/actions/init-integ-test
|
|
with:
|
|
java-version: ${{ matrix.java-version }}
|
|
- name: Setup Gradle
|
|
id: setup-gradle
|
|
uses: ./setup-gradle
|
|
with:
|
|
cache-read-only: false # For testing, allow writing cache entries on non-default branches
|
|
gradle-version: ${{ matrix.gradle }}
|
|
- name: Run Gradle build
|
|
id: gradle
|
|
working-directory: .github/workflow-samples/no-ge
|
|
run: gradle help
|
|
- name: Check Build Scan url
|
|
if: ${{ !steps.gradle.outputs.build-scan-url }}
|
|
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
|
with:
|
|
script: |
|
|
core.setFailed('No Build Scan detected')
|
|
- name: Check short lived token (DEVELOCITY_ACCESS_KEY)
|
|
run: "[ ${#DEVELOCITY_ACCESS_KEY} -gt 500 ] || (echo 'DEVELOCITY_ACCESS_KEY does not look like a short lived token'; exit 1)"
|
|
- name: Check short lived token (GRADLE_ENTERPRISE_ACCESS_KEY)
|
|
run: "[ ${#GRADLE_ENTERPRISE_ACCESS_KEY} -gt 500 ] || (echo 'GRADLE_ENTERPRISE_ACCESS_KEY does not look like a short lived token'; exit 1)"
|
|
|
|
inject-develocity-with-access-key:
|
|
env:
|
|
DEVELOCITY_INJECTION_ENABLED: true
|
|
DEVELOCITY_INJECTION_URL: 'https://ge.solutions-team.gradle.com'
|
|
DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION: ${{ matrix.plugin-version }}
|
|
DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION: '2.2.1'
|
|
strategy:
|
|
fail-fast: false
|
|
matrix:
|
|
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
|
|
os: ${{fromJSON(inputs.runner-os)}}
|
|
plugin-version: ['3.16.2', '4.5.0']
|
|
include:
|
|
- java-version: 17
|
|
- gradle: '8.14.3'
|
|
java-version: 11
|
|
- gradle: '7.6.2'
|
|
java-version: 11
|
|
- gradle: '6.9.4'
|
|
java-version: 11
|
|
- gradle: '5.6.4'
|
|
java-version: 11
|
|
runs-on: ${{ matrix.os }}
|
|
steps:
|
|
- name: Checkout sources
|
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
|
- name: Initialize integ-test
|
|
uses: ./.github/actions/init-integ-test
|
|
with:
|
|
java-version: ${{ matrix.java-version }}
|
|
- name: Setup Gradle
|
|
id: setup-gradle
|
|
uses: ./setup-gradle
|
|
with:
|
|
cache-read-only: false # For testing, allow writing cache entries on non-default branches
|
|
gradle-version: ${{ matrix.gradle }}
|
|
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
|
|
develocity-token-expiry: 1
|
|
- name: Run Gradle build
|
|
id: gradle
|
|
working-directory: .github/workflow-samples/no-ge
|
|
run: gradle help
|
|
- name: Check short lived token (DEVELOCITY_ACCESS_KEY)
|
|
run: "[ ${#DEVELOCITY_ACCESS_KEY} -gt 500 ] || (echo 'DEVELOCITY_ACCESS_KEY does not look like a short lived token'; exit 1)"
|
|
- name: Check short lived token (GRADLE_ENTERPRISE_ACCESS_KEY)
|
|
run: "[ ${#GRADLE_ENTERPRISE_ACCESS_KEY} -gt 500 ] || (echo 'GRADLE_ENTERPRISE_ACCESS_KEY does not look like a short lived token'; exit 1)"
|
|
- name: Check Build Scan url
|
|
if: ${{ !steps.gradle.outputs.build-scan-url }}
|
|
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
|
with:
|
|
script: |
|
|
core.setFailed('No Build Scan detected')
|
|
|
|
inject-develocity-short-lived-token-failed:
|
|
env:
|
|
DEVELOCITY_INJECTION_ENABLED: true
|
|
DEVELOCITY_INJECTION_URL: 'https://localhost:3333/'
|
|
DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION: ${{ matrix.plugin-version }}
|
|
DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION: '2.1'
|
|
# Access key also set as an env var, we want to check it does not leak
|
|
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
|
|
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
|
|
strategy:
|
|
fail-fast: false
|
|
matrix:
|
|
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
|
|
os: ${{fromJSON(inputs.runner-os)}}
|
|
plugin-version: [ '3.16.2', '4.5.0' ]
|
|
include:
|
|
- java-version: 17
|
|
- gradle: '8.14.3'
|
|
java-version: 11
|
|
- gradle: '7.6.2'
|
|
java-version: 11
|
|
- gradle: '6.9.4'
|
|
java-version: 11
|
|
- gradle: '5.6.4'
|
|
java-version: 11
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- name: Checkout sources
|
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
|
- name: Initialize integ-test
|
|
uses: ./.github/actions/init-integ-test
|
|
with:
|
|
java-version: ${{ matrix.java-version }}
|
|
- name: Setup Gradle
|
|
id: setup-gradle
|
|
uses: ./setup-gradle
|
|
with:
|
|
gradle-version: ${{ matrix.gradle }}
|
|
cache-read-only: false # For testing, allow writing cache entries on non-default branches
|
|
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
|
|
- name: Run Gradle build
|
|
id: gradle
|
|
working-directory: .github/workflow-samples/no-ge
|
|
run: gradle help
|
|
- name: Check access key is not blank (DEVELOCITY_ACCESS_KEY)
|
|
run: "[ \"${DEVELOCITY_ACCESS_KEY}\" != \"\" ] || (echo 'using DEVELOCITY_ACCESS_KEY!'; exit 1)"
|
|
- name: Check access key is not blank (GRADLE_ENTERPRISE_ACCESS_KEY)
|
|
run: "[ \"${GRADLE_ENTERPRISE_ACCESS_KEY}\" != \"\" ] || (echo 'GRADLE_ENTERPRISE_ACCESS_KEY is still supported in v3!'; exit 1)"
|
|
|
|
inject-develocity-with-access-key-from-input-actions:
|
|
env:
|
|
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
|
|
strategy:
|
|
fail-fast: false
|
|
matrix:
|
|
gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4']
|
|
os: ${{fromJSON(inputs.runner-os)}}
|
|
plugin-version: [ '3.16.2', '4.5.0' ]
|
|
include:
|
|
- java-version: 17
|
|
- gradle: '8.14.3'
|
|
java-version: 11
|
|
- gradle: '7.6.2'
|
|
java-version: 11
|
|
- gradle: '6.9.4'
|
|
java-version: 11
|
|
- gradle: '5.6.4'
|
|
java-version: 11
|
|
runs-on: ${{ matrix.os }}
|
|
steps:
|
|
- name: Checkout sources
|
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
|
|
- name: Initialize integ-test
|
|
uses: ./.github/actions/init-integ-test
|
|
with:
|
|
java-version: ${{ matrix.java-version }}
|
|
- name: Setup Gradle
|
|
id: setup-gradle
|
|
uses: ./setup-gradle
|
|
with:
|
|
cache-read-only: false # For testing, allow writing cache entries on non-default branches
|
|
gradle-version: ${{ matrix.gradle }}
|
|
develocity-injection-enabled: true
|
|
develocity-url: 'https://ge.solutions-team.gradle.com'
|
|
develocity-plugin-version: ${{ matrix.plugin-version }}
|
|
- name: Run Gradle build
|
|
id: gradle
|
|
working-directory: .github/workflow-samples/no-ge
|
|
run: gradle help
|
|
- name: Check Build Scan url
|
|
if: ${{ !steps.gradle.outputs.build-scan-url }}
|
|
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
|
|
with:
|
|
script: |
|
|
core.setFailed('No Build Scan detected')
|