diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 63a355bf..5627df52 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -25,8 +25,8 @@ jobs: do echo $line done - # - name: Build - # run: yarn build --report + - name: Build + run: yarn build --report - name: CDN download qshell run: | wget http://devtools.qiniu.com/qshell-linux-x86-v2.4.0.zip @@ -34,18 +34,18 @@ jobs: mv qshell-linux-x86-v2.4.0 qshell - name: CDN login run: ./qshell account ${{ secrets.AK }} ${{ secrets.SK }} GITHUB_ACTION - # - name: CDN upload - # run: | - # ./qshell qupload2 \ - # --src-dir=$GITHUB_WORKSPACE/dist \ - # --bucket=d2-cdn \ - # --key-prefix=${GITHUB_REPOSITORY//*\//}/preview/ \ - # --overwrite=true \ - # --check-exists=true \ - # --check-hash=true \ - # --check-size=true \ - # --rescan-local=true \ - # --thread-count=32 + - name: CDN upload + run: | + ./qshell qupload2 \ + --src-dir=$GITHUB_WORKSPACE/dist \ + --bucket=d2-cdn \ + --key-prefix=${GITHUB_REPOSITORY//*\//}/preview/ \ + --overwrite=true \ + --check-exists=true \ + --check-hash=true \ + --check-size=true \ + --rescan-local=true \ + --thread-count=32 - name: CDN refresh run: | echo "https://cdn.d2.pub/${GITHUB_REPOSITORY//*\//}/preview/" > cdnrefresh.txt @@ -69,19 +69,19 @@ jobs: do echo $line done - # - name: Build - # run: yarn build --report - # - name: Deploy - # uses: SamKirkland/FTP-Deploy-Action@2.0.0 - # env: - # FTP_SERVER: ${{ secrets.FTP_SERVER }} - # FTP_USERNAME: ${{ secrets.FTP_USERNAME }} - # FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} - # METHOD: sftp - # PORT: ${{ secrets.FTP_PORT }} - # LOCAL_DIR: dist - # REMOTE_DIR: /www/d2-admin/preview - # ARGS: --delete --verbose --parallel=100 + - name: Build + run: yarn build --report + - name: Deploy + uses: SamKirkland/FTP-Deploy-Action@2.0.0 + env: + FTP_SERVER: ${{ secrets.FTP_SERVER }} + FTP_USERNAME: ${{ secrets.FTP_USERNAME }} + FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} + METHOD: sftp + PORT: ${{ secrets.FTP_PORT }} + LOCAL_DIR: dist + REMOTE_DIR: /www/d2-admin/preview + ARGS: --delete --verbose --parallel=100 gh-pages: name: Github Pages @@ -101,13 +101,13 @@ jobs: do echo $line done - # - name: Build - # run: yarn build --report - # - name: Deploy - # uses: peaceiris/actions-gh-pages@v2 - # env: - # PERSONAL_TOKEN: ${{ secrets.ACCESS_TOKEN }} - # PUBLISH_BRANCH: gh-pages - # PUBLISH_DIR: ./dist - # with: - # forceOrphan: true \ No newline at end of file + - name: Build + run: yarn build --report + - name: Deploy + uses: peaceiris/actions-gh-pages@v2 + env: + PERSONAL_TOKEN: ${{ secrets.ACCESS_TOKEN }} + PUBLISH_BRANCH: gh-pages + PUBLISH_DIR: ./dist + with: + forceOrphan: true \ No newline at end of file