mirror of
https://github.com/gradle/actions
synced 2024-11-23 18:02:13 +00:00
Bump to CCUD plugin v2.0 everywhere
This commit is contained in:
parent
dbdb67aa6c
commit
a9dc5dee4e
7 changed files with 7 additions and 7 deletions
|
@ -1,6 +1,6 @@
|
|||
plugins {
|
||||
id "com.gradle.develocity" version "3.17"
|
||||
id "com.gradle.common-custom-user-data-gradle-plugin" version "1.13"
|
||||
id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0"
|
||||
}
|
||||
|
||||
develocity {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
plugins {
|
||||
id("com.gradle.develocity") version "3.17"
|
||||
id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13"
|
||||
id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0"
|
||||
}
|
||||
|
||||
develocity {
|
||||
|
|
|
@ -25,7 +25,7 @@ jobs:
|
|||
DEVELOCITY_INJECTION_ENABLED: true
|
||||
DEVELOCITY_URL: https://ge.solutions-team.gradle.com
|
||||
DEVELOCITY_PLUGIN_VERSION: ${{ matrix.plugin-version }}
|
||||
DEVELOCITY_CCUD_PLUGIN_VERSION: 1.13
|
||||
DEVELOCITY_CCUD_PLUGIN_VERSION: '2.0'
|
||||
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} # required to test against GE plugin 3.16.2
|
||||
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
|
||||
strategy:
|
||||
|
|
|
@ -7,7 +7,7 @@ export function setup(config: BuildScanConfig): void {
|
|||
if (config.getBuildScanPublishEnabled()) {
|
||||
maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true')
|
||||
maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.17')
|
||||
maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '1.13')
|
||||
maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '2.0')
|
||||
maybeExportVariable('DEVELOCITY_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl())
|
||||
maybeExportVariable('DEVELOCITY_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree())
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
plugins {
|
||||
id "com.gradle.develocity" version "3.17"
|
||||
id "com.gradle.common-custom-user-data-gradle-plugin" version "1.13"
|
||||
id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0"
|
||||
}
|
||||
|
||||
develocity {
|
||||
|
|
|
@ -17,7 +17,7 @@ import java.util.zip.GZIPOutputStream
|
|||
|
||||
class BaseInitScriptTest extends Specification {
|
||||
static final String DEVELOCITY_PLUGIN_VERSION = '3.17'
|
||||
static final String CCUD_PLUGIN_VERSION = '1.13'
|
||||
static final String CCUD_PLUGIN_VERSION = '2.0'
|
||||
|
||||
static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9)
|
||||
static final TestGradleVersion GRADLE_4_X = new TestGradleVersion(GradleVersion.version('4.10.3'), 7, 10)
|
||||
|
|
|
@ -315,7 +315,7 @@ class TestDevelocityInjection extends BaseInitScriptTest {
|
|||
|
||||
when:
|
||||
def config = testConfig().withCCUDPlugin().withServer(URI.create('https://develocity-server.invalid'))
|
||||
def result = run(testGradleVersion, config, ["help", "-Dgradle.enterprise.url=${mockScansServer.address}".toString()])
|
||||
def result = run(testGradleVersion, config, ["help", "-Ddevelocity.url=${mockScansServer.address}".toString()])
|
||||
|
||||
then:
|
||||
outputContainsDevelocityPluginApplicationViaInitScript(result, testGradleVersion.gradleVersion)
|
||||
|
|
Loading…
Reference in a new issue