From 8f6fa507c8c51330f2a9e3c8c676660790a4d519 Mon Sep 17 00:00:00 2001
From: Nikolay Kharitonov <o4kapuk@o4kapuk.ru>
Date: Mon, 12 Feb 2024 17:13:10 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20change=20npm=20publish=20order?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/npm.yml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
index 8f7ace1..df8b770 100644
--- a/.github/workflows/npm.yml
+++ b/.github/workflows/npm.yml
@@ -14,28 +14,25 @@ jobs:
       - name: ⤵️ Checkout
         uses: actions/checkout@v3
       # Setup .npmrc file to publish to GitHub Packages
-      - name: 🔨 Setup node (github registry)
+      - name: 👷 Install
+        run: npm ci
+      - name: 🔨 Setup node
         uses: actions/setup-node@v3
         with:
           node-version: '10.x'
-          registry-url: 'https://npm.pkg.github.com'
-          # Defaults to the user or organization that owns the workflow file
-          scope: '@screeps'
-      - name: 👷 Install
-        run: npm ci
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: 📦️ Publish package (github registry)
+      - name: 📦️ Publish package (npmjs)
         run: npm publish
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: 🔨 Setup node (npmjs)
+          NODE_AUTH_TOKEN: ${{ secrets.NPMJS_TOKEN }}
+      - name: 🔨 Setup node (github registry)
         uses: actions/setup-node@v3
         with:
           node-version: '10.x'
-          registry-url: 'https://registry.npmjs.org'
+          registry-url: 'https://npm.pkg.github.com'
+          # Defaults to the user or organization that owns the workflow file
           scope: '@screeps'
-      - name: 📦️ Publish package (npmjs)
+      - name: 📦️ Publish package (github registry)
         run: npm publish
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPMJS_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+