From 8b9031b0c2925ac67aaf62e3754d1c7d9fdf8e1b Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Mon, 8 Feb 2021 17:59:37 +0100
Subject: [PATCH] npm token refactor

---
 .github/workflows/build-npm.yaml | 24 +++++++-----------------
 packages/api/.npmrc              |  1 -
 packages/dbgate/.npmrc           |  1 -
 packages/sqltree/.npmrc          |  1 -
 packages/tools/.npmrc            |  1 -
 packages/types/.npmrc            |  1 -
 packages/web/.npmrc              |  1 -
 7 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 packages/api/.npmrc
 delete mode 100644 packages/dbgate/.npmrc
 delete mode 100644 packages/sqltree/.npmrc
 delete mode 100644 packages/tools/.npmrc
 delete mode 100644 packages/types/.npmrc
 delete mode 100644 packages/web/.npmrc

diff --git a/.github/workflows/build-npm.yaml b/.github/workflows/build-npm.yaml
index db1186c4d..e0977e9af 100644
--- a/.github/workflows/build-npm.yaml
+++ b/.github/workflows/build-npm.yaml
@@ -35,67 +35,57 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 10.x
-      - name: yarn install
+
+      - name: Configure NPM token
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
+
+      - name: yarn install
         run: |
           yarn install
+          
       - name: setCurrentVersion
         run: |
           yarn setCurrentVersion
 
       - name: Publish types
         working-directory: packages/types
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm publish
 
       - name: Publish tools
         working-directory: packages/tools
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm publish
 
       - name: Publish sqltree
         working-directory: packages/sqltree
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm publish
                     
       - name: Publish api
         working-directory: packages/api
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm publish
 
       - name: Publish datalib
         working-directory: packages/datalib
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm publish
 
       - name: Publish filterparser
         working-directory: packages/filterparser
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm publish
 
       - name: Publish web
         working-directory: packages/web
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm publish
                                         
       - name: Publish dbgate
         working-directory: packages/dbgate
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm publish
diff --git a/packages/api/.npmrc b/packages/api/.npmrc
deleted file mode 100644
index ae643592e..000000000
--- a/packages/api/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-//registry.npmjs.org/:_authToken=${NPM_TOKEN}
diff --git a/packages/dbgate/.npmrc b/packages/dbgate/.npmrc
deleted file mode 100644
index ae643592e..000000000
--- a/packages/dbgate/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-//registry.npmjs.org/:_authToken=${NPM_TOKEN}
diff --git a/packages/sqltree/.npmrc b/packages/sqltree/.npmrc
deleted file mode 100644
index ae643592e..000000000
--- a/packages/sqltree/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-//registry.npmjs.org/:_authToken=${NPM_TOKEN}
diff --git a/packages/tools/.npmrc b/packages/tools/.npmrc
deleted file mode 100644
index ae643592e..000000000
--- a/packages/tools/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-//registry.npmjs.org/:_authToken=${NPM_TOKEN}
diff --git a/packages/types/.npmrc b/packages/types/.npmrc
deleted file mode 100644
index ae643592e..000000000
--- a/packages/types/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-//registry.npmjs.org/:_authToken=${NPM_TOKEN}
diff --git a/packages/web/.npmrc b/packages/web/.npmrc
deleted file mode 100644
index ae643592e..000000000
--- a/packages/web/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-//registry.npmjs.org/:_authToken=${NPM_TOKEN}