简化 CI 部署

.github/workflows/deploy.yml

@@ -0,0 +1,50 @@
+name: Build and upload to qiniu CDN
+
+on:
+  push:
+    branches:
+      - master
+
+env:
+  SITE: https://fairyever.com/
+  QINIU_BUCKET: fairyever-site
+  DIST_FOLDER: /dist
+  PATH_SUFFIX: /preview
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '10.x'
+    - name: Download qshell
+      run: |
+        wget http://devtools.qiniu.com/qshell-linux-x86-v2.4.0.zip
+        unzip qshell-linux-x86-v2.4.0.zip
+        mv qshell-linux-x86-v2.4.0 qshell
+    - name: Install packages
+      run: npm i
+    - name: Build
+      run: npm run build:github
+    - name: CDN login
+      run: ./qshell account ${{ secrets.AK }} ${{ secrets.SK }} GITHUB_ACTION
+    - name: CDN upload
+      run: |
+        REPO=${GITHUB_REPOSITORY//*\//}
+        REFRESH_URL=$SITE$REPO$PATH_SUFFIX/
+        echo $REFRESH_URL > cdnrefresh.txt
+        ./qshell qupload2\
+         --src-dir=$GITHUB_WORKSPACE$DIST_FOLDER\
+         --bucket=$QINIU_BUCKET\
+         --key-prefix=$REPO$PATH_SUFFIX/\
+         --overwrite=true\
+         --check-exists=true\
+         --check-hash=true\
+         --check-size=true\
+         --rescan-local=true
+    - name: CDN refresh
+      run: ./qshell cdnrefresh --dirs -i ./cdnrefresh.txt

.github/workflows/qiniu.yml

@@ -1,31 +0,0 @@
-name: Build and upload to qiniu CDN
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '10.x'
-    - name: install packages
-      run: npm i
-    - name: build
-      run: npm run build:github
-    - name: qiniu login
-      run: ./deploy/qshell account ${{ secrets.AK }} ${{ secrets.SK }} liyang
-    - name: qiniu upload
-      run: |
-        dist=$GITHUB_WORKSPACE/dist
-        bucket=fairyever-site
-        prefix=d2-admin/preview/
-        ./deploy/qshell qupload2 --src-dir=$dist --bucket=$bucket --key-prefix=$prefix --overwrite=true --check-exists=true --check-hash=true --check-size=true --rescan-local=true
-    - name: refresn CDN
-      run: ./deploy/qshell cdnrefresh --dirs -i ./deploy/cdnrefresh.txt

deploy/cdnrefresh.txt

@@ -1 +0,0 @@
-https://fairyever.com/d2-admin/preview/