From 6efb0098a1bbb79baf6bff53d1c0ff77f8b70313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 12 Aug 2023 20:21:28 +0300
Subject: [PATCH] dev: CI cleanups (#4008)

---
 .github/workflows/pr.yml  | 6 +++---
 .github/workflows/tag.yml | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index f1323fe6..a68739b9 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -114,9 +114,6 @@ jobs:
   check_generated:
     needs: golangci-lint # run after golangci-lint action to not produce duplicated errors
     runs-on: ubuntu-latest
-    env:
-      # needed for github-action-config.json generation
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v3
       - name: Unshallow
@@ -131,3 +128,6 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
       - name: Check generated files are up to date
         run: make fast_check_generated
+        env:
+          # needed for github-action-config.json generation
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
index 0c05b61c..4f039588 100644
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@@ -7,8 +7,6 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GOLANGCI_LINT_TOKEN }}
     steps:
       - uses: actions/checkout@v3
       - name: Install Go
@@ -26,7 +24,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v4
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GOLANGCI_LINT_TOKEN }}