diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1bf50ee16..5d489cf79 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,22 +14,22 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Checkout theme repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: repository: prinsss/hexo-theme-murasaki ref: master path: themes/murasaki - name: Set up Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v3 with: - node-version: 17 + node-version: 18 - name: Cache pnpm modules - uses: actions/cache@v2 + uses: actions/cache@v3 id: pnpm-cache with: path: ~/.pnpm-store @@ -38,24 +38,21 @@ jobs: ${{ runner.os }}-pnpm- - name: Set up pnpm and install dependencies - uses: pnpm/action-setup@v2.0.1 + uses: pnpm/action-setup@v2 with: - version: 6.21.0 + version: 8.10.2 run_install: | args: [--prefer-offline, --frozen-lockfile] - name: Set up environment env: DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }} - DEPLOY_KEY_OLD: ${{ secrets.DEPLOY_KEY_OLD }} run: | sudo timedatectl set-timezone "Asia/Shanghai" mkdir -p ~/.ssh echo "$DEPLOY_KEY" > ~/.ssh/id_rsa - echo "$DEPLOY_KEY_OLD" > ~/.ssh/old_key - chmod 600 ~/.ssh/id_rsa ~/.ssh/old_key + chmod 600 ~/.ssh/id_rsa ssh-keyscan github.com >> ~/.ssh/known_hosts - cp .github/workflows/ssh_config ~/.ssh/config - name: Deploy run: | diff --git a/.github/workflows/ssh_config b/.github/workflows/ssh_config deleted file mode 100644 index cb7e27e1c..000000000 --- a/.github/workflows/ssh_config +++ /dev/null @@ -1,7 +0,0 @@ -Host gh_new - HostName github.com - IdentityFile ~/.ssh/id_rsa - -Host gh_old - HostName github.com - IdentityFile ~/.ssh/old_key diff --git a/_config.yml b/_config.yml index a5c7acf24..f6d641623 100644 --- a/_config.yml +++ b/_config.yml @@ -110,9 +110,9 @@ theme_config: enable: true loading_image: images/loading.jpg disqus: - enable: false + enable: true shortname: blessing-studio - api: https://disqus.printempw.workers.dev/api/ + api: https://disqus.skk.moe/disqus/ apikey: 5O1HIIFsAWX3lBOQveU8qWPPAd2aLyf1fklehBAfcQ7S9Jo8y4acIrmyO2uxMD35 admin: printempw admin_label: 博主 @@ -138,12 +138,10 @@ hide_posts: ## Docs: https://hexo.io/docs/deployment.html deploy: type: git - repo: - new: git@gh_new:prinsss/prinsss.github.io.git - old: git@gh_old:printempw/printempw.github.io.git + repo: git@github.com:prinsss/prinsss.github.io.git branch: master name: prin - email: printempw@gmail.com + email: hi@prin.studio # hexo-math math: