From a6da1e4dc56c1fb4bf89aeee470fea8eb36dfd30 Mon Sep 17 00:00:00 2001
From: MoyuScript <i@moyu.moe>
Date: Sun, 2 Aug 2020 16:14:29 +0800
Subject: [PATCH] Update ci (#2307)

---
 .github/workflows/ci.yml | 22 ++++++++++++++--------
 README.md                |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed79f64..2537f6d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -177,10 +177,6 @@ jobs:
     needs: browser-test
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-          registry-url: 'https://npm.pkg.github.com'
       - name: Download NPM package
         uses: actions/download-artifact@v2
         with:
@@ -200,7 +196,7 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
           draft: false
-          prerelease: false
+          prerelease: ${{ contains(github.ref, '-rc.') || contains(github.ref, '-alpha.') }}
       - name: Upload html2canvas.js
         uses: actions/upload-release-asset@v1
         env:
@@ -230,10 +226,22 @@ jobs:
           asset_content_type: text/javascript
       - name: Unpack npm
         run: cd npm && tar -xvzf "html2canvas.tgz"
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: 'https://npm.pkg.github.com'
       - name: NPM Publish (github)
-        run: npm publish
+        run: cd package && npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: 'https://registry.npmjs.org'
+#      - name: NPM Publish
+#        run: cd package && npm publish public
+#        env:
+#          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
   docs:
     runs-on: ubuntu-latest
     name: Build docs
@@ -282,8 +290,6 @@ jobs:
         with:
           name: docs
           path: www/public
-      - name: Echo
-        run: echo ${{ github.ref }}
   publish-docs:
     runs-on: ubuntu-latest
     name: Publish Docs
diff --git a/README.md b/README.md
index 8b63c73..a3680d3 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ html2canvas
 [Homepage](https://html2canvas.hertzen.com) | [Downloads](https://github.com/niklasvh/html2canvas/releases) | [Questions](http://stackoverflow.com/questions/tagged/html2canvas?sort=newest)
 
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/niklasvh/html2canvas?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) 
-[![Build Status](https://dev.azure.com/niklasvh/html2canvas/_apis/build/status/niklasvh.html2canvas?branchName=master)](https://dev.azure.com/niklasvh/html2canvas/_build/latest?definitionId=1&branchName=master)
+![CI](https://github.com/niklasvh/html2canvas/workflows/CI/badge.svg?branch=master)
 [![NPM Downloads](https://img.shields.io/npm/dm/html2canvas.svg)](https://www.npmjs.org/package/html2canvas)
 [![NPM Version](https://img.shields.io/npm/v/html2canvas.svg)](https://www.npmjs.org/package/html2canvas)