From 79bad900c08bc46eaf2277d99d548b968994ebbe Mon Sep 17 00:00:00 2001 From: daz Date: Thu, 30 Jan 2025 08:46:34 -0700 Subject: [PATCH 1/3] Fix deprecation warnings in dependency-graph init-script --- ...actions.github-dependency-graph-gradle-plugin-apply.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/src/resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy b/sources/src/resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy index f9ea6423..37a3df47 100644 --- a/sources/src/resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy +++ b/sources/src/resources/init-scripts/gradle-actions.github-dependency-graph-gradle-plugin-apply.groovy @@ -15,8 +15,8 @@ buildscript { if (pluginRepositoryUsername && pluginRepositoryPassword) { logger.lifecycle("Applying credentials for plugin repository: ${pluginRepositoryUrl}") credentials { - username(pluginRepositoryUsername) - password(pluginRepositoryPassword) + username = pluginRepositoryUsername + password = pluginRepositoryPassword } authentication { basic(BasicAuthentication) From 0b492c475f504e36ead18a16150445eff0744fbc Mon Sep 17 00:00:00 2001 From: daz Date: Thu, 30 Jan 2025 08:47:32 -0700 Subject: [PATCH 2/3] Fix deprecation warnings in develocity init-script This change has been made directly to the init-script, and will be superceded by the equivalent fix in the reference script. --- .../gradle-actions.inject-develocity.init.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/src/resources/init-scripts/gradle-actions.inject-develocity.init.gradle b/sources/src/resources/init-scripts/gradle-actions.inject-develocity.init.gradle index 1f52c4d8..1e560c67 100644 --- a/sources/src/resources/init-scripts/gradle-actions.inject-develocity.init.gradle +++ b/sources/src/resources/init-scripts/gradle-actions.inject-develocity.init.gradle @@ -45,12 +45,12 @@ initscript { repositories { maven { - url pluginRepositoryUrl + url = pluginRepositoryUrl if (pluginRepositoryUsername && pluginRepositoryPassword) { logger.lifecycle("Using credentials for plugin repository") credentials { - username(pluginRepositoryUsername) - password(pluginRepositoryPassword) + username = pluginRepositoryUsername + password = pluginRepositoryPassword } authentication { basic(BasicAuthentication) From 6f10c21ec5f599a0b89667926d38072802b3d6fc Mon Sep 17 00:00:00 2001 From: daz Date: Thu, 30 Jan 2025 09:02:58 -0700 Subject: [PATCH 3/3] Make it easier to produce 'prerelease' versions --- .github/workflows/ci-integ-test-full.yml | 2 ++ .github/workflows/ci-update-dist.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/ci-integ-test-full.yml b/.github/workflows/ci-integ-test-full.yml index 9e205a3c..dc929902 100644 --- a/.github/workflows/ci-integ-test-full.yml +++ b/.github/workflows/ci-integ-test-full.yml @@ -3,6 +3,8 @@ name: CI-integ-test-full on: workflow_dispatch: push: + branches: + - 'main' paths: - 'dist/**' diff --git a/.github/workflows/ci-update-dist.yml b/.github/workflows/ci-update-dist.yml index 8ef9bbad..baf89d06 100644 --- a/.github/workflows/ci-update-dist.yml +++ b/.github/workflows/ci-update-dist.yml @@ -5,6 +5,7 @@ on: push: branches: - 'main' + - 'prerelease/**' - 'release/**' paths-ignore: - 'dist/**'