adjust npmrc and npm publish

FortAwesome · Aug 2, 2021 · 023105b · 023105b
1 parent 624b577
commit 023105b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,48 +7,39 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
+    env:
+      CLOUDSMITH_API_TOKEN: ${{ secrets.CLOUDSMITH_TOKEN }}
+      NPM_TOKEN: ${{ secrets.NPM_REGISTRY_ACCESS_TOKEN }}
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
         node-version: '14'
     - name: Prepare Main
-      env:
-        NPM_TOKEN: ${{ secrets.CLOUDSMITH_TOKEN }}
       run: |
         cd packages/fa-icon-chooser
         npm install
         npm run format.check
         npm run build
         npm run test
     - name: Publish Main - npmjs
-      env:
-        NPM_TOKEN: ${{ secrets.NPM_REGISTRY_ACCESS_TOKEN }}
       run: |
         cd packages/fa-icon-chooser
-        npm publish --access public
+        npm publish --access public --registry=https://registry.npmjs.org
     - name: Prepare React
-      env:
-        NPM_TOKEN: ${{ secrets.CLOUDSMITH_TOKEN }}
       run: |
         cd packages/fa-icon-chooser-react
         npm install
         npm run build
     - name: Publish React - npmjs
-      env:
-        NPM_TOKEN: ${{ secrets.NPM_REGISTRY_ACCESS_TOKEN }}
       run: |
         cd packages/fa-icon-chooser-react
-        npm publish --access public
+        npm publish --access public --registry=https://registry.npmjs.org
     - name: Publish Main - Cloudsmith
-      env:
-        NPM_TOKEN: ${{ secrets.CLOUDSMITH_TOKEN }}
       run: |
         cd packages/fa-icon-chooser
         npm publish --registry https://npm.fontawesome.com
     - name: Publish React - Cloudsmith
-      env:
-        NPM_TOKEN: ${{ secrets.CLOUDSMITH_TOKEN }}
       run: |
         cd packages/fa-icon-chooser-react
         npm publish --registry https://npm.fontawesome.com
diff --git a/packages/fa-icon-chooser-react/.npmrc b/packages/fa-icon-chooser-react/.npmrc
@@ -1 +1,2 @@
-//npm.fontawesome.com/:_authToken=${NPM_TOKEN}
+//registry.npmjs.org/:_authToken=${NPM_TOKEN}
+//npm.fontawesome.com/:_authToken=${CLOUDSMITH_API_TOKEN}
diff --git a/packages/fa-icon-chooser-react/package.json b/packages/fa-icon-chooser-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@fortawesome/fa-icon-chooser-react",
   "sideEffects": false,
-  "version": "0.1.5",
+  "version": "0.1.6",
   "private": false,
   "description": "React specific wrapper for @fortawesome/fa-icon-chooser",
   "repository": {

diff --git a/packages/fa-icon-chooser/.npmrc b/packages/fa-icon-chooser/.npmrc
@@ -1 +1,2 @@
-//npm.fontawesome.com/:_authToken=${NPM_TOKEN}
+//registry.npmjs.org/:_authToken=${NPM_TOKEN}
+//npm.fontawesome.com/:_authToken=${CLOUDSMITH_API_TOKEN}
diff --git a/packages/fa-icon-chooser/package.json b/packages/fa-icon-chooser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fortawesome/fa-icon-chooser",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Font Awesome Icon Chooser",
   "main": "dist/index.cjs.js",
   "private": false,