From a7907a57e6873643505f45bd725c454585a4b765 Mon Sep 17 00:00:00 2001 From: Jory Irving Date: Tue, 23 Jan 2024 21:45:22 -0700 Subject: [PATCH] fix: env vars --- .github/workflows/bulk-merge-prs.yaml | 6 +++--- .github/workflows/flux-diff.yaml | 8 ++++---- .github/workflows/flux-hr-sync.yaml | 6 +++--- .github/workflows/flux-image-test.yaml | 8 ++++---- .github/workflows/flux-ks-sync.yaml | 6 +++--- .github/workflows/label-sync.yaml | 4 ++-- .github/workflows/labeler.yaml | 4 ++-- .github/workflows/lychee.yaml | 4 ++-- .github/workflows/publish-terraform.yaml | 4 ++-- .github/workflows/release.yaml | 4 ++-- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/bulk-merge-prs.yaml b/.github/workflows/bulk-merge-prs.yaml index 74e2a2a644..e7fd222f6d 100644 --- a/.github/workflows/bulk-merge-prs.yaml +++ b/.github/workflows/bulk-merge-prs.yaml @@ -32,8 +32,8 @@ uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Checkout uses: actions/checkout@v4 @@ -46,7 +46,7 @@ GITHUB_TOKEN: "${{ steps.app-token.outputs.token }}" run: | args=() - args+=(--app ${{ env.BOT_USERNAME }}) + args+=(--app $BOT_USERNAME) args+=(--state open) if [ "${{ github.event.inputs.labels }}" != "any" ]; then IFS=',' read -ra labels <<< "${{ github.event.inputs.labels }}" diff --git a/.github/workflows/flux-diff.yaml b/.github/workflows/flux-diff.yaml index 536f90cb94..018d19a2c3 100644 --- a/.github/workflows/flux-diff.yaml +++ b/.github/workflows/flux-diff.yaml @@ -30,8 +30,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Checkout Default Branch uses: actions/checkout@v4 @@ -69,8 +69,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/flux-hr-sync.yaml b/.github/workflows/flux-hr-sync.yaml index aec1766da6..377a723c72 100644 --- a/.github/workflows/flux-hr-sync.yaml +++ b/.github/workflows/flux-hr-sync.yaml @@ -38,8 +38,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Checkout uses: actions/checkout@v4 @@ -58,7 +58,7 @@ jobs: id: kubeconfig uses: timheuer/base64-to-file@v1 with: - encodedString: "${{ env.KUBECONFIG }}" + encodedString: "$KUBECONFIG" fileName: kubeconfig - if: ${{ github.event.inputs.clusterName == '' && github.event.inputs.helmRepoNamespace == '' && github.event.inputs.helmRepoName == '' }} diff --git a/.github/workflows/flux-image-test.yaml b/.github/workflows/flux-image-test.yaml index 2cf7962959..95e85ebd27 100644 --- a/.github/workflows/flux-image-test.yaml +++ b/.github/workflows/flux-image-test.yaml @@ -30,8 +30,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Checkout uses: actions/checkout@v4 @@ -70,8 +70,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Setup Homebrew uses: Homebrew/actions/setup-homebrew@master diff --git a/.github/workflows/flux-ks-sync.yaml b/.github/workflows/flux-ks-sync.yaml index 3d021976a5..4fd1df87bd 100644 --- a/.github/workflows/flux-ks-sync.yaml +++ b/.github/workflows/flux-ks-sync.yaml @@ -28,8 +28,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Checkout uses: actions/checkout@v4 @@ -47,7 +47,7 @@ jobs: id: kubeconfig uses: timheuer/base64-to-file@v1 with: - encodedString: "${{ env.KUBECONFIG }}" + encodedString: "$KUBECONFIG" fileName: kubeconfig - name: Sync Kustomization diff --git a/.github/workflows/label-sync.yaml b/.github/workflows/label-sync.yaml index 92fb00e53f..479ae79c43 100644 --- a/.github/workflows/label-sync.yaml +++ b/.github/workflows/label-sync.yaml @@ -27,8 +27,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml index 0d99b29302..6a6a06735e 100644 --- a/.github/workflows/labeler.yaml +++ b/.github/workflows/labeler.yaml @@ -27,8 +27,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Labeler uses: actions/labeler@v5 diff --git a/.github/workflows/lychee.yaml b/.github/workflows/lychee.yaml index 19229f33ce..e2a8806f5d 100644 --- a/.github/workflows/lychee.yaml +++ b/.github/workflows/lychee.yaml @@ -31,8 +31,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/publish-terraform.yaml b/.github/workflows/publish-terraform.yaml index d5b99ced3a..7521450881 100644 --- a/.github/workflows/publish-terraform.yaml +++ b/.github/workflows/publish-terraform.yaml @@ -28,8 +28,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3b8f0d9640..f2c60786c0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,8 +24,8 @@ jobs: uses: actions/create-github-app-token@v1 id: app-token with: - app-id: "${{ env.BOT_APP_ID }}" - private-key: "${{ env.BOT_APP_PRIVATE_KEY }}" + app-id: "$BOT_APP_ID" + private-key: "$BOT_APP_PRIVATE_KEY" - name: Checkout uses: actions/checkout@v4