diff --git a/.github/workflows/deploy-cdn.yml b/.github/workflows/deploy-cdn.yml deleted file mode 100644 index 2c5bfc20..00000000 --- a/.github/workflows/deploy-cdn.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Deploy https://cdn.d2.pub - -on: - push: - branches: - - master - -env: - SITE: https://cdn.d2.pub/ - QINIU_BUCKET: d2-cdn - 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:preview - - name: CDN login - run: ./qshell account ${{ secrets.AK }} ${{ secrets.SK }} GITHUB_ACTION - - name: CDN upload - run: | - REPO=${GITHUB_REPOSITORY//*\//} - echo $SITE > 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 \ - --thread-count=32 - - name: CDN refresh - run: ./qshell cdnrefresh --dirs -i ./cdnrefresh.txt \ No newline at end of file diff --git a/.github/workflows/deploy-d2.yml b/.github/workflows/deploy-d2.yml deleted file mode 100644 index 5a2c197c..00000000 --- a/.github/workflows/deploy-d2.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Deploy https://d2.pub - -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: Build - run: | - npm install - npm run build:preview - - 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 \ No newline at end of file diff --git a/.github/workflows/deploy-github.yml b/.github/workflows/deploy-github.yml deleted file mode 100644 index 5c93e9c8..00000000 --- a/.github/workflows/deploy-github.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Deploy Github - -on: - push: - branches: - - master - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - name: Build and Deploy - uses: JamesIves/github-pages-deploy-action@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} - BRANCH: gh-pages - FOLDER: dist - BUILD_SCRIPT: npm install && npm run build:github - CLEAN: true \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..2eeca58d --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,86 @@ +name: Deploy preview + +on: + push: + branches: + - master + +jobs: + + cdn: + name: Qiniu CDN + 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:preview + - 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 refresh + run: | + REFRESH_URL=https://cdn.d2.pub/${GITHUB_REPOSITORY//*\//}/preview/ + echo $REFRESH_URL > cdnrefresh.txt + ./qshell cdnrefresh --dirs -i ./cdnrefresh.txt + + ftp: + name: D2 FTP + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-node@v1 + with: + node-version: '10.x' + - name: Build + run: | + npm install + npm run build:preview + - 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 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: bahmutov/npm-install@v1 + - name: Build + run: yarn build:github + - 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