chore(yarn): cleanup yarn environment

Signed-off-by: Lexus Drumgold <[email protected]>
flex-development · Aug 16, 2022 · 71871db · 71871db
1 parent aa078c1
commit 71871db
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -70,7 +70,7 @@ jobs:
     needs: metadata
     runs-on: ubuntu-latest
     env:
-      GH_PAT: ${{ secrets.PAT_GPR_ADMIN }}
+      GITHUB_TOKEN: ${{ secrets.PAT_GPR_ADMIN }}
       NPM_TOKEN: ${{ secrets.NPM_TOKEN_ADMIN }}
     strategy:
       matrix:
@@ -93,7 +93,7 @@ jobs:
         run: yarn --immutable
         env:
           HUSKY: 0
-          NODE_AUTH_TOKEN: ${{ env.GH_PAT }}
+          NODE_AUTH_TOKEN: ${{ env.GITHUB_TOKEN }}
       - id: pack
         name: Pack project
         run: yarn pack -o %s-%v.tgz
@@ -119,7 +119,7 @@ jobs:
         run: gh release create $TAG $ASSET -t=$TAG -F=$NOTES_FILE -p=$PRERELEASE
         env:
           ASSET: ${{ needs.metadata.outputs.artifact-path }}
-          GITHUB_TOKEN: ${{ env.GH_PAT }}
+          GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }}
           NOTES_FILE: ./RELEASE_NOTES.md
           PRERELEASE: ${{ needs.metadata.outputs.prerelease }}
           TAG: ${{ needs.metadata.outputs.tag }}
@@ -128,7 +128,7 @@ jobs:
     needs: [metadata, publish-release]
     runs-on: ubuntu-latest
     env:
-      GH_PAT: ${{ secrets.PAT_GPR_ADMIN }}
+      GITHUB_TOKEN: ${{ secrets.PAT_GPR_ADMIN }}
       NPM_TOKEN: ${{ secrets.NPM_TOKEN_ADMIN }}
       SCOPE: '@${{ github.repository_owner }}'
     strategy:
@@ -154,7 +154,7 @@ jobs:
         run: yarn --immutable
         env:
           HUSKY: 0
-          NODE_AUTH_TOKEN: ${{ env.GH_PAT }}
+          NODE_AUTH_TOKEN: ${{ env.GITHUB_TOKEN }}
       - id: pack
         name: Pack project
         run: yarn pack -o %s-%v.tgz
@@ -168,7 +168,7 @@ jobs:
         env:
           ARTIFACT: ${{ needs.metadata.outputs.artifact-path }}
           DIST_TAG: ${{ needs.metadata.outputs.dist-tag }}
-          NODE_AUTH_TOKEN: ${{ env.GH_PAT }}
+          NODE_AUTH_TOKEN: ${{ env.GITHUB_TOKEN }}
       - id: setup-npmrc-npm
         name: Setup .npmrc file [NPM]
         uses: actions/setup-node@v3

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
   ci:
     runs-on: ubuntu-latest
     env:
-      GH_PAT: ${{ secrets.PAT_GPR_ADMIN }}
+      GITHUB_TOKEN: ${{ secrets.PAT_GPR_ADMIN }}
       NODE_AUTH_TOKEN: ${{ secrets.PAT_GPR_ADMIN }}
       NPM_TOKEN: ${{ secrets.NPM_TOKEN_ADMIN }}
     strategy:

diff --git a/.github/workflows/integrity.yml b/.github/workflows/integrity.yml
@@ -30,7 +30,7 @@ jobs:
   integrity-check:
     runs-on: ubuntu-latest
     env:
-      GH_PAT: ${{ secrets.PAT_GPR_ADMIN }}
+      GITHUB_TOKEN: ${{ secrets.PAT_GPR_ADMIN }}
       NODE_AUTH_TOKEN: ${{ secrets.PAT_GPR_ADMIN }}
       NPM_TOKEN: ${{ secrets.NPM_TOKEN_ADMIN }}
     strategy:

diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -21,23 +21,10 @@ npmPublishAccess: public
 
 npmPublishRegistry: https://npm.pkg.github.com
 
-npmRegistries:
-  //npm.pkg.github.com:
-    npmAlwaysAuth: true
-    npmAuthToken: ${GH_PAT}
-
-  //registry.npmjs.org:
-    npmAlwaysAuth: true
-    npmAuthToken: ${NPM_TOKEN}
-
-  //registry.yarnpkg.org:
-    npmAlwaysAuth: true
-    npmAuthToken: ${NPM_TOKEN}
-
-npmRegistryServer: https://registry.yarnpkg.com
-
 npmScopes:
   flex-development:
+    npmAlwaysAuth: true
+    npmAuthToken: ${GITHUB_TOKEN}
     npmRegistryServer: https://npm.pkg.github.com
 
 yarnPath: .yarn/releases/yarn-4.0.0-rc.14.cjs