From 8447d5d371ab98aa527453ad9cb992cb8367b562 Mon Sep 17 00:00:00 2001 From: Jeff Ma Date: Mon, 9 Jun 2025 14:20:52 -0400 Subject: [PATCH 1/2] fix ci --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6baa30ff..4a546f0e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "deploy:setup-user": "git config --global user.name 'github-actions[bot]'", "deploy:setup-email": "git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'", "deploy:setup-history": "rm -rf .deploy_git && git clone --branch $(hexo config deploy.branch --silent) $(hexo config deploy.repo --silent) .deploy_git", - "predeploy": "(npm run deploy:setup-user & npm run deploy:setup-email) && npm run deploy:setup-history", + "predeploy": "npm run deploy:setup-user && npm run deploy:setup-email && npm run deploy:setup-history", "deploy": "hexo generate --deploy" }, "hexo": { From e2ec31f9cad1e0cb9044e787ebd7b9df833a2ef5 Mon Sep 17 00:00:00 2001 From: Jeff Ma Date: Mon, 9 Jun 2025 14:24:20 -0400 Subject: [PATCH 2/2] make CI fail on deploy error --- .github/workflows/ci-workflow.yml | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 7a9d47f5..6a060a75 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -48,4 +48,6 @@ jobs: - name: Deploy env: COMMIT_MESSAGE: ${{ github.event.head_commit.message }} - run: npm run deploy -- --msg "$COMMIT_MESSAGE" + run: | + set -e + npm run deploy -- --msg "$COMMIT_MESSAGE" diff --git a/package.json b/package.json index 4a546f0e..72b90521 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "deploy:setup-email": "git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'", "deploy:setup-history": "rm -rf .deploy_git && git clone --branch $(hexo config deploy.branch --silent) $(hexo config deploy.repo --silent) .deploy_git", "predeploy": "npm run deploy:setup-user && npm run deploy:setup-email && npm run deploy:setup-history", - "deploy": "hexo generate --deploy" + "deploy": "hexo generate --deploy --bail" }, "hexo": { "version": "6.3.0"