actions/gradle
1
0
Fork 0
mirror of https://github.com/gradle/actions.git synced 2025-08-22 09:41:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dependabot/npm_and_yarn/sources/npm-dependencies-8b954a0c8b

Browse Source
This commit is contained in:
Jérôme Prinet 2025-08-21 11:40:36 +02:00 committed by GitHub
commit 1122f31763
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflow-samples/groovy-dsl/settings.gradle vendored
View File

@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.1"
id "com.gradle.develocity" version "4.1.1"
id "com.gradle.common-custom-user-data-gradle-plugin" version "2.3"
}

2
.github/workflow-samples/kotlin-dsl/settings.gradle.kts vendored
View File

@ -1,5 +1,5 @@
plugins {
id("com.gradle.develocity") version "4.1"
id("com.gradle.develocity") version "4.1.1"
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.3"
}

2
.github/workflow-samples/no-wrapper-gradle-5/build.gradle vendored
View File

@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.1"
id "com.gradle.develocity" version "4.1.1"
}
develocity {

2
.github/workflow-samples/no-wrapper/settings.gradle vendored
View File

@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.1"
id "com.gradle.develocity" version "4.1.1"
}
develocity {

2
.github/workflow-samples/non-executable-wrapper/settings.gradle vendored
View File

@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.1"
id "com.gradle.develocity" version "4.1.1"
}
develocity {

10
.github/workflows/integ-test-inject-develocity.yml vendored
View File

@ -30,7 +30,7 @@ jobs:
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.1']
plugin-version: ['3.16.2', '4.1.1']
include:
- java-version: 17
- gradle: '8.14.3'
@ -43,7 +43,7 @@ jobs:
java-version: 11
- plugin-version: '3.16.2'
accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY
- plugin-version: '4.1'
- plugin-version: '4.1.1'
accessKeyEnv: DEVELOCITY_ACCESS_KEY
runs-on: ${{ matrix.os }}
env:
@ -92,7 +92,7 @@ jobs:
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.1']
plugin-version: ['3.16.2', '4.1.1']
include:
- java-version: 17
- gradle: '8.14.3'
@ -148,7 +148,7 @@ jobs:
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.1' ]
plugin-version: [ '3.16.2', '4.1.1' ]
include:
- java-version: 17
- gradle: '8.14.3'
@ -191,7 +191,7 @@ jobs:
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.1' ]
plugin-version: [ '3.16.2', '4.1.1' ]
include:
- java-version: 17
- gradle: '8.14.3'

2
docs/setup-gradle.md
View File

@ -847,7 +847,7 @@ Here's a minimal example:
run: ./gradlew build
```
This configuration will automatically apply `v4.1` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com.
This configuration will automatically apply `v4.1.1` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com.
This example assumes that the `develocity.your-server.com` server allows anonymous publishing of build scans.
In the likely scenario that your Develocity server requires authentication, you will also need to pass a valid [Develocity access key](https://docs.gradle.com/develocity/gradle-plugin/#via_environment_variable) taken from a secret:

2
sources/src/develocity/build-scan.ts
View File

@ -34,7 +34,7 @@ export async function setup(config: BuildScanConfig): Promise<void> {
// except if they are defined in the configuration
if (config.getBuildScanPublishEnabled()) {
maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true')
maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.1')
maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.1.1')
maybeExportVariable('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', '2.1')
maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl())
maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree())

4
sources/src/wrapper-validation/wrapper-checksums.json
View File

@ -1,4 +1,8 @@
[
{
"version": "9.1.0-rc-1",
"checksum": "76805e32c009c0cf0dd5d206bddc9fb22ea42e84db904b764f3047de095493f3"
},
{
"version": "9.0.0",
"checksum": "76805e32c009c0cf0dd5d206bddc9fb22ea42e84db904b764f3047de095493f3"

2
sources/test/init-scripts/settings.gradle
View File

@ -1,5 +1,5 @@
plugins {
id "com.gradle.develocity" version "4.1"
id "com.gradle.develocity" version "4.1.1"
id "com.gradle.common-custom-user-data-gradle-plugin" version "2.3"
}

2
sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy
View File

@ -16,7 +16,7 @@ import java.nio.file.Files
import java.util.zip.GZIPOutputStream
class BaseInitScriptTest extends Specification {
static final String DEVELOCITY_PLUGIN_VERSION = '4.1'
static final String DEVELOCITY_PLUGIN_VERSION = '4.1.1'
static final String CCUD_PLUGIN_VERSION = '2.1'
static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9)

2
sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy
View File

@ -248,7 +248,7 @@ task expectFailure {
when:
settingsFile.text = """
plugins {
id 'com.gradle.develocity' version '4.1' apply(false)
id 'com.gradle.develocity' version '4.1.1' apply(false)
}
gradle.settingsEvaluated {
apply plugin: 'com.gradle.develocity'