Update to Scope v0.2.4

undefinedlabs · Dec 13, 2019 · 98e3c5b · 98e3c5b
1 parent e035f37
commit 98e3c5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -3453,7 +3453,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(__webpack_require__(310));
 const executor = __importStar(__webpack_require__(826));
 const exec = __importStar(__webpack_require__(230));
-const SCOPE_AGENT_VERSION = "0.2.2";
+const SCOPE_AGENT_VERSION = "0.2.4";
 function run() {
  return __awaiter(this, void 0, void 0, function* () {
  try {
@@ -4041,22 +4041,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const exec = __importStar(__webpack_require__(230));
 const io = __importStar(__webpack_require__(954));
 const tc = __importStar(__webpack_require__(602));
-const IS_WINDOWS = process.platform === 'win32';
 function instrument(agentVersion) {
  return __awaiter(this, void 0, void 0, function* () {
- let scopeAgentPath = yield tc.downloadTool("https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-agent/" + agentVersion + "/scope-agent-" + agentVersion + ".jar");
+ const workdir = process.cwd();
+ 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");
  }
- let mavenInstrumentatorPath = yield tc.downloadTool("https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-instrumentation-for-maven/0.1.0/scope-instrumentation-for-maven-0.1.0.jar");
+ const mavenInstrumentatorPath = yield tc.downloadTool("https://repo1.maven.org/maven2/com/undefinedlabs/scope/scope-instrumentation-for-maven/0.1.0/scope-instrumentation-for-maven-0.1.0.jar");
  if (!mavenInstrumentatorPath.endsWith(".jar")) {
  yield io.mv(mavenInstrumentatorPath, mavenInstrumentatorPath + ".jar");
  }
- if (IS_WINDOWS) {
- scopeAgentPath = scopeAgentPath.replace("\\", "\\\\");
- mavenInstrumentatorPath = mavenInstrumentatorPath.replace("\\", "\\\\");
- }
- yield exec.exec("sh -c \"find . -name \\\"pom.xml\\\" -exec java -jar " + mavenInstrumentatorPath + ".jar \\\"" + scopeAgentPath + ".jar\\\" {} \\;\"");
+ yield exec.exec("sh -c \"find " + workdir + " -name \\\"pom.xml\\\" -exec java -jar " + mavenInstrumentatorPath + ".jar \\\"" + scopeAgentPath + ".jar\\\" {} \\;\"");
  });
 }
 exports.instrument = instrument;

diff --git a/src/scope-for-maven.ts b/src/scope-for-maven.ts
@@ -2,7 +2,7 @@ import * as core from '@actions/core'
 import * as executor from './executor'
 import * as exec from "@actions/exec";
 
-const SCOPE_AGENT_VERSION = "0.2.2";
+const SCOPE_AGENT_VERSION = "0.2.4";
 
 async function run() {
  try {