Merge pull request #14 from getappmap/feat/live-urls

feat: Live urls
getappmap · May 24, 2023 · b257831 · b257831
2 parents 6ee786d + a6006bf
commit b257831
Show file tree

Hide file tree

Showing 15 changed files with 183 additions and 81 deletions.
diff --git a/.github/workflows/appmap-archive.yml b/.github/workflows/appmap-archive.yml
@@ -21,9 +21,8 @@ jobs:
 
       - name: Install AppMap tools
         run: |
-          curl -o /usr/local/bin/appmap -L https://github.com/getappmap/appmap-js/releases/download/%40appland%2Fappmap-preflight-v1.0-pre.19/appmap-preflight-linux-x64
+          curl -o /usr/local/bin/appmap -L https://github.com/getappmap/appmap-js/releases/download/%40appland%2Fappmap-preflight-v1.0-pre.21/appmap-preflight-linux-x64
           chmod a+x /usr/local/bin/appmap
-          ln -s /usr/local/bin/appmap /tmp/appmap
 
       - name: Build AppMaps
         run: yarn test

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,9 +23,8 @@ jobs:
 
       - name: Install AppMap tools
         run: |
-          curl -o /usr/local/bin/appmap -L https://github.com/getappmap/appmap-js/releases/download/%40appland%2Fappmap-preflight-v1.0-pre.19/appmap-preflight-linux-x64
+          curl -o /usr/local/bin/appmap -L https://github.com/getappmap/appmap-js/releases/download/%40appland%2Fappmap-preflight-v1.0-pre.21/appmap-preflight-linux-x64
           chmod a+x /usr/local/bin/appmap
-          ln -s /usr/local/bin/appmap /tmp/appmap
 
       - name: Build
         run: yarn build

diff --git a/dist/check/index.js b/dist/check/index.js
diff --git a/dist/preflight/index.js b/dist/preflight/index.js
diff --git a/dist/preflight/index.js.map b/dist/preflight/index.js.map
diff --git a/src/Archiver.ts b/src/Archiver.ts
@@ -6,7 +6,7 @@ import log, {LogLevel} from './log';
 import verbose from './verbose';
 
 export default class Archiver {
-  public appmapCommand = '/tmp/appmap';
+  public appmapCommand = 'appmap';
   public archiveBranch = 'appmap-archive';
 
   constructor(public artifactStore: ArtifactStore, public revision: string) {}

diff --git a/src/Compare.ts b/src/Compare.ts
@@ -5,7 +5,7 @@ import log, {LogLevel} from './log';
 import verbose from './verbose';
 
 export default class Compare {
-  public appmapCommand = '/tmp/appmap';
+  public appmapCommand = 'appmap';
   public sourceDir?: string;
   public outputDir?: string;
 

diff --git a/src/CommandOptions.ts → src/CompareOptions.ts b/src/CommandOptions.ts → src/CompareOptions.ts
@@ -1,6 +1,6 @@
-export interface CommandOptions {
-  baseRef: string;
-  headRef: string;
+export default interface CompareOptions {
+  baseRevision: string;
+  headRevision: string;
   appmapCommand?: string;
   sourceDir?: string;
   githubToken?: string;

diff --git a/src/MarkdownReport.ts b/src/MarkdownReport.ts
@@ -1,14 +1,20 @@
+import ReportOptions from './ReportOptions';
 import {executeCommand} from './executeCommand';
 import verbose from './verbose';
 
 export default class MarkdownReport {
-  public appmapCommand = '/tmp/appmap';
+  public appmapCommand = 'appmap';
 
-  constructor(public reportDir: string) {}
+  constructor(public reportDir: string, public options: ReportOptions) {
+    if (options.appmapCommand) this.appmapCommand = options.appmapCommand;
+  }
 
   async generateReport() {
-    let cmd = `${this.appmapCommand} compare-report ${this.reportDir}`;
+    let cmd = `${this.appmapCommand} compare-report`;
     if (verbose()) cmd += ' --verbose';
+    if (this.options.sourceURL) cmd += ` --source-url '${this.options.sourceURL}'`;
+    if (this.options.appmapURL) cmd += ` --appmap-url '${this.options.appmapURL}'`;
+    cmd += ` ${this.reportDir}`;
     await executeCommand(cmd);
   }
 }
diff --git a/src/ReportOptions.ts b/src/ReportOptions.ts
@@ -0,0 +1,5 @@
+export default interface ReportOptions {
+  sourceURL?: URL;
+  appmapURL?: URL;
+  appmapCommand?: string;
+}
diff --git a/src/Restore.ts b/src/Restore.ts
@@ -4,7 +4,7 @@ import verbose from './verbose';
 export default class Restore {
   public repository?: string;
   public githubToken?: string;
-  public appmapCommand = '/tmp/appmap';
+  public appmapCommand = 'appmap';
 
   constructor(public revision: string, public outputDir: string) {}
 

diff --git a/src/check.ts b/src/check.ts
@@ -36,7 +36,7 @@ async function runInGitHub(): Promise<void> {
   }
 
   if (process.env.GITHUB_STEP_SUMMARY) {
-    await writeFile(summary.join('\n'), process.env.GITHUB_STEP_SUMMARY);
+    await writeFile(process.env.GITHUB_STEP_SUMMARY, summary.join('\n'));
   }
   process.exit(1);
 }