Merge remote-tracking branch 'origin/main' into dependabot/maven/maven-build-scan-capture-extension/maven-dependencies-a179772d6b

* origin/main:
  Add custom value when Develocity auto-injection is on (#150)

Author: alextu

dist/setup-maven/main/index.js

@@ -39659,7 +39659,7 @@ async function constructDevelocityMavenOpts(downloadFolder) {
             const credentials = username && password ? { username, password } : undefined;
             if (input.getDevelocityMavenExtensionVersion()) {
                 const develocityMavenExtensionJar = await io.downloadFile(`${repository}com/gradle/develocity-maven-extension/${input.getDevelocityMavenExtensionVersion()}/develocity-maven-extension-${input.getDevelocityMavenExtensionVersion()}.jar`, downloadFolder, credentials);
-                develocityMavenExtensionMavenOpts = `${io.getDelimiter()}${develocityMavenExtensionJar} -Dgradle.enterprise.url=${input.getDevelocityUrl()} -Ddevelocity.url=${input.getDevelocityUrl()}`;
+                develocityMavenExtensionMavenOpts = `${io.getDelimiter()}${develocityMavenExtensionJar} -Dgradle.enterprise.url=${input.getDevelocityUrl()} -Ddevelocity.url=${input.getDevelocityUrl()} -Dscan.value.CIAutoInjection=GitHub`;
                 if (input.getDevelocityAllowUntrustedServer()) {
                     develocityMavenExtensionMavenOpts = `${develocityMavenExtensionMavenOpts} -Ddevelocity.allowUntrustedServer=${input.getDevelocityAllowUntrustedServer()}`;
                 }

dist/setup-npm/main/index.js

@@ -39618,6 +39618,7 @@ function configureEnvironment(wrappersDir) {
     if (allowUntrustedServer) {
         core.exportVariable('DEVELOCITY_ALLOW_UNTRUSTED_SERVER', allowUntrustedServer);
     }
+    core.exportVariable('DEVELOCITY_VALUE_CIAutoInjection', 'GitHub');
 }
 async function findAndVerifyBinary(binaryName) {
     // Find the actual npm binary

package-lock.json

@@ -62,6 +62,7 @@ describe('Injection', () => {
         // then
         expect(result).toContain('-Dgradle.enterprise.url=http://example.com')
         expect(result).toContain('-Ddevelocity.url=http://example.com')
+        expect(result).not.toContain('-Dscan.value.CIAutoInjection=GitHub')
     })
 
     it('injects Develocity Maven extension', async () => {
@@ -103,6 +104,7 @@ describe('Injection', () => {
         expect(result).toContain(':develocity-maven-extension-42.0.jar')
         expect(result).toContain('-Dgradle.enterprise.url=http://example.com')
         expect(result).toContain('-Ddevelocity.url=http://example.com')
+        expect(result).toContain('-Dscan.value.CIAutoInjection=GitHub')
     })
 
     it('injects CCUD Maven extension', async () => {

setup-maven/__tests__/injection.test.ts

@@ -35,7 +35,7 @@ export async function constructDevelocityMavenOpts(downloadFolder: string): Prom
                     downloadFolder,
                     credentials
                 )
-                develocityMavenExtensionMavenOpts = `${io.getDelimiter()}${develocityMavenExtensionJar} -Dgradle.enterprise.url=${input.getDevelocityUrl()} -Ddevelocity.url=${input.getDevelocityUrl()}`
+                develocityMavenExtensionMavenOpts = `${io.getDelimiter()}${develocityMavenExtensionJar} -Dgradle.enterprise.url=${input.getDevelocityUrl()} -Ddevelocity.url=${input.getDevelocityUrl()} -Dscan.value.CIAutoInjection=GitHub`
                 if (input.getDevelocityAllowUntrustedServer()) {
                     develocityMavenExtensionMavenOpts = `${develocityMavenExtensionMavenOpts} -Ddevelocity.allowUntrustedServer=${input.getDevelocityAllowUntrustedServer()}`
                 }

setup-maven/src/injection.ts

@@ -130,6 +130,7 @@ function configureEnvironment(wrappersDir: string): void {
     if (allowUntrustedServer) {
         core.exportVariable('DEVELOCITY_ALLOW_UNTRUSTED_SERVER', allowUntrustedServer)
     }
+    core.exportVariable('DEVELOCITY_VALUE_CIAutoInjection', 'GitHub')
 }
 
 async function findAndVerifyBinary(binaryName: string): Promise<string> {