Merge pull request #334 from product-os/kyle/hide-ghcr-token-secret

Remove the global GHCR_TOKEN env var as it contains secrets
product-os · Nov 24, 2022 · 9b7db86 · 9b7db86
2 parents c0d3ae0 + 93c0b56
commit 9b7db86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
diff --git a/flowzone.yml b/flowzone.yml
@@ -180,7 +180,6 @@ concurrency:
 
 env:
   GHCR_USER: "flowzone" # does not seem to matter what is used here
-  GHCR_TOKEN: ${{ secrets.GHCR_TOKEN || secrets.FLOWZONE_TOKEN }}
   NPM_REGISTRY: registry.npmjs.org
   CARGO_REGISTRY: crates.io
 
@@ -1053,7 +1052,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ env.GHCR_USER }}
-          password: ${{ env.GHCR_TOKEN }}
+          password: ${{ secrets.GHCR_TOKEN || secrets.FLOWZONE_TOKEN }}
 
       - name: Login to Docker Hub
         continue-on-error: true
@@ -1199,7 +1198,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ env.GHCR_USER }}
-          password: ${{ env.GHCR_TOKEN }}
+          password: ${{ secrets.GHCR_TOKEN || secrets.FLOWZONE_TOKEN }}
 
       - name: Login to Docker Hub
         continue-on-error: true