Don't overwrite dependency-graph env vars

This allows these vars to be explicitly set, which is required for testing (and could prove useful for debugging).
gradle · Jan 16, 2024 · 3466457 · 3466457
1 parent 5516b39
commit 3466457
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 26 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
@@ -139984,17 +139984,22 @@ function setup(option) {
             return;
         }
         core.info('Enabling dependency graph generation');
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_ENABLED', 'true');
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_CONTINUE_ON_FAILURE', (0, input_params_1.getDependencyGraphContinueOnFailure)());
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR', getJobCorrelator());
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_ID', github.context.runId);
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_REF', github.context.ref);
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_SHA', getShaFromContext());
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_WORKSPACE', layout.workspaceDirectory());
-        core.exportVariable('DEPENDENCY_GRAPH_REPORT_DIR', path.resolve(layout.workspaceDirectory(), 'dependency-graph-reports'));
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_ENABLED', 'true');
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_CONTINUE_ON_FAILURE', (0, input_params_1.getDependencyGraphContinueOnFailure)());
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR', getJobCorrelator());
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_ID', github.context.runId);
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_REF', github.context.ref);
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_SHA', getShaFromContext());
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_WORKSPACE', layout.workspaceDirectory());
+        maybeExportVariable('DEPENDENCY_GRAPH_REPORT_DIR', path.resolve(layout.workspaceDirectory(), 'dependency-graph-reports'));
     });
 }
 exports.setup = setup;
+function maybeExportVariable(variableName, value) {
+    if (!process.env[variableName]) {
+        core.exportVariable(variableName, value);
+    }
+}
 function complete(option) {
     return __awaiter(this, void 0, void 0, function* () {
         try {

diff --git a/dist/main/index.js.map b/dist/main/index.js.map
diff --git a/dist/post/index.js b/dist/post/index.js
@@ -137437,17 +137437,22 @@ function setup(option) {
             return;
         }
         core.info('Enabling dependency graph generation');
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_ENABLED', 'true');
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_CONTINUE_ON_FAILURE', (0, input_params_1.getDependencyGraphContinueOnFailure)());
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR', getJobCorrelator());
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_ID', github.context.runId);
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_REF', github.context.ref);
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_SHA', getShaFromContext());
-        core.exportVariable('GITHUB_DEPENDENCY_GRAPH_WORKSPACE', layout.workspaceDirectory());
-        core.exportVariable('DEPENDENCY_GRAPH_REPORT_DIR', path.resolve(layout.workspaceDirectory(), 'dependency-graph-reports'));
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_ENABLED', 'true');
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_CONTINUE_ON_FAILURE', (0, input_params_1.getDependencyGraphContinueOnFailure)());
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR', getJobCorrelator());
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_ID', github.context.runId);
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_REF', github.context.ref);
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_SHA', getShaFromContext());
+        maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_WORKSPACE', layout.workspaceDirectory());
+        maybeExportVariable('DEPENDENCY_GRAPH_REPORT_DIR', path.resolve(layout.workspaceDirectory(), 'dependency-graph-reports'));
     });
 }
 exports.setup = setup;
+function maybeExportVariable(variableName, value) {
+    if (!process.env[variableName]) {
+        core.exportVariable(variableName, value);
+    }
+}
 function complete(option) {
     return __awaiter(this, void 0, void 0, function* () {
         try {

diff --git a/dist/post/index.js.map b/dist/post/index.js.map
diff --git a/src/dependency-graph.ts b/src/dependency-graph.ts
@@ -31,19 +31,25 @@ export async function setup(option: DependencyGraphOption): Promise<void> {
     }
 
     core.info('Enabling dependency graph generation')
-    core.exportVariable('GITHUB_DEPENDENCY_GRAPH_ENABLED', 'true')
-    core.exportVariable('GITHUB_DEPENDENCY_GRAPH_CONTINUE_ON_FAILURE', getDependencyGraphContinueOnFailure())
-    core.exportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR', getJobCorrelator())
-    core.exportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_ID', github.context.runId)
-    core.exportVariable('GITHUB_DEPENDENCY_GRAPH_REF', github.context.ref)
-    core.exportVariable('GITHUB_DEPENDENCY_GRAPH_SHA', getShaFromContext())
-    core.exportVariable('GITHUB_DEPENDENCY_GRAPH_WORKSPACE', layout.workspaceDirectory())
-    core.exportVariable(
+    maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_ENABLED', 'true')
+    maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_CONTINUE_ON_FAILURE', getDependencyGraphContinueOnFailure())
+    maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_CORRELATOR', getJobCorrelator())
+    maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_JOB_ID', github.context.runId)
+    maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_REF', github.context.ref)
+    maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_SHA', getShaFromContext())
+    maybeExportVariable('GITHUB_DEPENDENCY_GRAPH_WORKSPACE', layout.workspaceDirectory())
+    maybeExportVariable(
         'DEPENDENCY_GRAPH_REPORT_DIR',
         path.resolve(layout.workspaceDirectory(), 'dependency-graph-reports')
     )
 }
 
+function maybeExportVariable(variableName: string, value: unknown): void {
+    if (!process.env[variableName]) {
+        core.exportVariable(variableName, value)
+    }
+}
+
 export async function complete(option: DependencyGraphOption): Promise<void> {
     try {
         switch (option) {