From 25971529fd06a1fb96d5160481c93ec6635dc030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 10 Nov 2020 14:20:33 +0100
Subject: [PATCH] allow auth token to be enough for pushing paths

---
 dist/main/index.js | 14 ++++++++++----
 src/main.ts        | 12 ++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/dist/main/index.js b/dist/main/index.js
index ffdc54cf..4a1a8ec9 100644
--- a/dist/main/index.js
+++ b/dist/main/index.js
@@ -1052,7 +1052,7 @@ function setup() {
             core.startGroup('Cachix: installing');
             yield exec.exec('bash', ['-c', installCommand]);
             core.endGroup();
-            // for private caches
+            // for managed signing key and private caches
             if (authToken !== "") {
                 yield exec.exec(cachixExecutable, ['authtoken', authToken]);
             }
@@ -1070,9 +1070,9 @@ function setup() {
             }
             if (signingKey !== "") {
                 core.exportVariable('CACHIX_SIGNING_KEY', signingKey);
-                // Remember existing store paths
-                yield exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' > /tmp/store-path-pre-build`]);
             }
+            // Remember existing store paths
+            yield exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' > /tmp/store-path-pre-build`]);
         }
         catch (error) {
             core.setFailed(`Action failed with error: ${error}`);
@@ -1083,11 +1083,17 @@ function setup() {
 function upload() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            if (signingKey !== "" && skipPush !== 'true') {
+            if (skipPush === 'true') {
+                core.info('Pushing is disabled as skipPush is set to true');
+            }
+            else if (signingKey !== "" || authToken !== "") {
                 core.startGroup('Cachix: pushing paths');
                 child_process_1.execFileSync(`${__dirname}/push-paths.sh`, [cachixExecutable, name], { stdio: 'inherit' });
                 core.endGroup();
             }
+            else {
+                core.info('Pushing is disabled as signing key nor auth token are set.');
+            }
         }
         catch (error) {
             core.setFailed(`Action failed with error: ${error}`);
diff --git a/src/main.ts b/src/main.ts
index cb568c93..a0b77544 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -22,7 +22,7 @@ async function setup() {
     await exec.exec('bash', ['-c', installCommand]);
     core.endGroup()
 
-    // for private caches
+    // for managed signing key and private caches
     if (authToken !== "") {
       await exec.exec(cachixExecutable, ['authtoken', authToken]);
     }
@@ -43,9 +43,9 @@ async function setup() {
 
     if (signingKey !== "") {
       core.exportVariable('CACHIX_SIGNING_KEY', signingKey);
-      // Remember existing store paths
-      await exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' > /tmp/store-path-pre-build`]);
     }
+    // Remember existing store paths
+    await exec.exec("sh", ["-c", `nix path-info --all | grep -v '\.drv$' > /tmp/store-path-pre-build`]);
   } catch (error) {
     core.setFailed(`Action failed with error: ${error}`);
     throw (error);
@@ -54,10 +54,14 @@ async function setup() {
 
 async function upload() {
   try {
-    if (signingKey !== "" && skipPush !== 'true') {
+    if (skipPush === 'true') {
+      core.info('Pushing is disabled as skipPush is set to true');
+    } else if (signingKey !== "" || authToken !== "") {
       core.startGroup('Cachix: pushing paths');
       execFileSync(`${__dirname}/push-paths.sh`, [cachixExecutable, name], { stdio: 'inherit' });
       core.endGroup();
+    } else {
+      core.info('Pushing is disabled as signing key nor auth token are set.');
     }
   } catch (error) {
     core.setFailed(`Action failed with error: ${error}`);