chore: reduce duplicate secrets

unionlabs · Aug 13, 2024 · 504b471 · 504b471
1 parent 1e76e15
commit 504b471
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,8 +25,8 @@ jobs:
     uses: unionlabs/workflows/.github/workflows/build.yml@8fdbd5d131725a503e1e8c7a415edf6726da25c5
     secrets:
       nixbuild_token: ${{ secrets.nixbuild_token }}
-      access-tokens: github.com=${{ secrets.GH_NIX_TOKEN }}
-      org_token: ${{ secrets.GH_NIX_TOKEN }}
+      access-tokens: github.com=${{ secrets.UNION_ORG_PAT }}
+      org_token: ${{ secrets.UNION_ORG_PAT }}
     with:
       eval_target: 'site'
       eval_top_attr: 'packages'

diff --git a/.github/workflows/e2e-manual.yml b/.github/workflows/e2e-manual.yml
@@ -7,6 +7,6 @@ jobs:
   build:
     uses: ./.github/workflows/e2e.yml
     secrets:
-      nixbuild_token: ${{ secrets.nixbuild_token }}
-      github-token: ${{ secrets.GITHUB_TOKEN }}
-      org_token: ${{ secrets.GH_NIX_TOKEN }}
+      nixbuild_token: ${{ secrets.NIXBUILD_TOKEN }}
+      github_token: ${{ secrets.GITHUB_TOKEN }}
+      org_token: ${{ secrets.UNION_ORG_PAT }}
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -6,7 +6,7 @@ on:
     secrets:
       nixbuild_token:
         required: true
-      github-token:
+      github_token:
         required: true
       org_token:
         required: true
@@ -16,7 +16,7 @@ jobs:
     uses: unionlabs/workflows/.github/workflows/build.yml@8fdbd5d131725a503e1e8c7a415edf6726da25c5
     secrets:
       nixbuild_token: ${{ secrets.nixbuild_token }}
-      access-tokens: github.com=${{ secrets.GH_NIX_TOKEN }}
-      org_token: ${{ secrets.GH_NIX_TOKEN }}
+      access-tokens: github.com=${{ secrets.github_token }}
+      org_token: ${{ secrets.org_token }}
     with:
       filter_builds: '((.top_attr == "checks") and (.system == "x86_64-linux") and (.attr == "virtualisation-works" or .attr == "ensure-blocks" or .attr == "sepolia-runs" or .attr == "union-runs" or .attr == "epoch-completes" or .attr == "forced-set-rotation" or .attr == "upgrade-from-genesis" or .attr == "upgrade-with-tokenfactory-state"))'
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -11,8 +11,8 @@ jobs:
     uses: ./.github/workflows/e2e.yml
     secrets:
       nixbuild_token: ${{ secrets.nixbuild_token }}
-      github-token: ${{ secrets.GITHUB_TOKEN }}
-      org_token: ${{ secrets.GH_NIX_TOKEN }}
+      github_token: ${{ secrets.GITHUB_TOKEN }}
+      org_token: ${{ secrets.UNION_ORG_PAT }}
 
   create-issue:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release-component.yml b/.github/workflows/release-component.yml
@@ -229,7 +229,7 @@ jobs:
         with:
           lfs: true
           fetch-depth: 0
-          token: ${{ secrets.GH_NIX_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
       - name: Annotate Manifest
         env:
           COMPONENT: ${{ needs.eval-tag.outputs.component }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,8 +9,8 @@ jobs:
     uses: unionlabs/workflows/.github/workflows/build.yml@8fdbd5d131725a503e1e8c7a415edf6726da25c5
     secrets:
       nixbuild_token: ${{ secrets.nixbuild_token }}
-      access-tokens: github.com=${{ secrets.GH_NIX_TOKEN }}
-      org_token: ${{ secrets.GH_NIX_TOKEN }}
+      access-tokens: github.com=${{ secrets.UNION_ORG_PAT }}
+      org_token: ${{ secrets.UNION_ORG_PAT }}
     with:
       # ensure to append this list if you want to release more artifacts
       filter_builds: |