cleanup: CI: Prune unneeded environment variables

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
emissary-ingress · Feb 17, 2022 · 3cb3e7e · 3cb3e7e
1 parent 27a9cf4
commit 3cb3e7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/promote-ga.yml b/.github/workflows/promote-ga.yml
@@ -14,7 +14,6 @@ jobs:
       AWS_EC2_METADATA_DISABLED: true
       DEV_REGISTRY: ${{ secrets.DEV_REGISTRY }}
       RELEASE_REGISTRY: ${{ secrets.RELEASE_REGISTRY }}
-      GCLOUD_SA_KEY: ${{ secrets.GCLOUD_SA_KEY }}
     steps:
       - uses: actions/checkout@v2
         with:
@@ -49,9 +48,6 @@ jobs:
     needs: [promote-to-ga]
     name: "Create GitHub release"
     env:
-      GIT_TOKEN: ${{ secrets.GH_GITHUB_API_KEY }}
-      AUTO_USER: ${{ secrets.GH_AUTO_USER }}
-      AUTO_EMAIL: ${{ secrets.GH_AUTO_EMAIL }}
       AMBASSADOR_RELENG_NO_GUI: "1"
     steps:
       - uses: actions/checkout@v2
@@ -61,7 +57,7 @@ jobs:
         uses: ./.github/actions/setup-deps
       - name: "gh auth login"
         run: |
-          echo "${GIT_TOKEN}" | gh auth login --with-token
+          echo '${{ secrets.GH_GITHUB_API_KEY }}' | gh auth login --with-token
       - name: Create GitHub release
         id: step-create-gh-release
         run: |

diff --git a/releng/lib/mirror_artifacts.py b/releng/lib/mirror_artifacts.py
@@ -17,10 +17,8 @@ def run(args: List[str], /) -> None:
 
 @contextmanager
 def gcr_login() -> Generator[None, None, None]:
-    key = os.getenv('GCLOUD_SA_KEY')
-    if key == '':
-        key = run_txtcapture(
-            ['keybase', 'fs', 'read', '/keybase/team/datawireio/secrets/googlecloud.gcr-ci-robot.datawire.json.key'])
+    key = run_txtcapture(
+        ['keybase', 'fs', 'read', '/keybase/team/datawireio/secrets/googlecloud.gcr-ci-robot.datawire.json.key'])
 
     subprocess.run(
         ['gcloud', 'auth', 'activate-service-account', '--key-file=-'],