Avoid tracking dependencies from gradle action (#13)

undefinedlabs · May 28, 2020 · 20f23d6 · 20f23d6
1 parent 8f2e5fa
commit 20f23d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -13373,19 +13373,18 @@ const version_parser_1 = __webpack_require__(59);
 const scopeAgentMetadataURL = "https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-agent/maven-metadata.xml";
 const scopeGradlePluginMetadataURL = "https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-gradle-plugin/maven-metadata.xml";
 const scopeGradleInstrMetadataURL = "https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-instrumentation-for-gradle/maven-metadata.xml";
+const scopeNoTrackDep = "_scope_notrackdep";
 function instrument(allowBeta) {
     return __awaiter(this, void 0, void 0, function* () {
         const workdir = process.cwd();
         const [agentVersion, pluginVersion, instrVersion] = yield Promise.all([version_parser_1.getVersionToUse(scopeAgentMetadataURL, allowBeta), version_parser_1.getVersionToUse(scopeGradlePluginMetadataURL, false), version_parser_1.getVersionToUse(scopeGradleInstrMetadataURL, false)]);
         const gradleInstrumentatorPath = yield tc.downloadTool(`https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-instrumentation-for-gradle/${instrVersion}/scope-instrumentation-for-gradle-${instrVersion}.jar`);
-        if (!gradleInstrumentatorPath.endsWith(".jar")) {
-            yield io.mv(gradleInstrumentatorPath, gradleInstrumentatorPath + ".jar");
-        }
+        const finalGradleInstrumentatorPath = `${gradleInstrumentatorPath.replace('.jar', '')}${scopeNoTrackDep}.jar`;
+        yield io.mv(gradleInstrumentatorPath, finalGradleInstrumentatorPath);
         const scopeAgentPath = yield tc.downloadTool(`https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-agent/${agentVersion}/scope-agent-${agentVersion}.jar`);
-        if (!scopeAgentPath.endsWith(".jar")) {
-            yield io.mv(scopeAgentPath, scopeAgentPath + ".jar");
-        }
-        yield exec.exec(`sh -c "java -jar ${gradleInstrumentatorPath}.jar ${pluginVersion} ${scopeAgentPath}.jar ${workdir} "`);
+        const finalScopeAgentPath = `${scopeAgentPath.replace('.jar', '')}${scopeNoTrackDep}.jar`;
+        yield io.mv(scopeAgentPath, finalScopeAgentPath);
+        yield exec.exec(`sh -c "java -jar ${finalGradleInstrumentatorPath} ${pluginVersion} ${finalScopeAgentPath} ${workdir} "`);
     });
 }
 exports.instrument = instrument;

diff --git a/src/executor.ts b/src/executor.ts
@@ -6,20 +6,19 @@ import { getVersionToUse } from './version-parser'
 const scopeAgentMetadataURL = "https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-agent/maven-metadata.xml";
 const scopeGradlePluginMetadataURL = "https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-gradle-plugin/maven-metadata.xml";
 const scopeGradleInstrMetadataURL = "https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-instrumentation-for-gradle/maven-metadata.xml";
+const scopeNoTrackDep = "_scope_notrackdep";
 
 export async function instrument(allowBeta:boolean): Promise<void> {
     const workdir = process.cwd();
     const [agentVersion, pluginVersion, instrVersion] = await Promise.all([getVersionToUse(scopeAgentMetadataURL, allowBeta), getVersionToUse(scopeGradlePluginMetadataURL, false), getVersionToUse(scopeGradleInstrMetadataURL, false)])
 
     const gradleInstrumentatorPath = await tc.downloadTool(`https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-instrumentation-for-gradle/${instrVersion}/scope-instrumentation-for-gradle-${instrVersion}.jar`);
-    if(!gradleInstrumentatorPath.endsWith(".jar")){
-        await io.mv(gradleInstrumentatorPath, gradleInstrumentatorPath+".jar");
-    }
+    const finalGradleInstrumentatorPath = `${gradleInstrumentatorPath.replace('.jar', '')}${scopeNoTrackDep}.jar`
+    await io.mv(gradleInstrumentatorPath, finalGradleInstrumentatorPath);
 
     const scopeAgentPath = await tc.downloadTool(`https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-agent/${agentVersion}/scope-agent-${agentVersion}.jar`);
-    if(!scopeAgentPath.endsWith(".jar")) {
-        await io.mv(scopeAgentPath, scopeAgentPath+".jar");
-    }
+    const finalScopeAgentPath = `${scopeAgentPath.replace('.jar', '')}${scopeNoTrackDep}.jar`
+    await io.mv(scopeAgentPath, finalScopeAgentPath);
 
-    await exec.exec(`sh -c "java -jar ${gradleInstrumentatorPath}.jar ${pluginVersion} ${scopeAgentPath}.jar ${workdir} "`);
+    await exec.exec(`sh -c "java -jar ${finalGradleInstrumentatorPath} ${pluginVersion} ${finalScopeAgentPath} ${workdir} "`);
 }