From 53135449969aba9d849227907f7c6359c5866cb7 Mon Sep 17 00:00:00 2001 From: "shijinyu.7" Date: Thu, 30 Jul 2026 19:01:16 +0800 Subject: [PATCH] fix(cicd): add auto merge --- .github/workflows/push_doc_to_archive.yaml | 2 +- .github/workflows/push_doc_to_preview.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push_doc_to_archive.yaml b/.github/workflows/push_doc_to_archive.yaml index 01ca9c4f..df6f3b00 100644 --- a/.github/workflows/push_doc_to_archive.yaml +++ b/.github/workflows/push_doc_to_archive.yaml @@ -54,7 +54,7 @@ jobs: current_commit="$(git rev-list -n 1 "$tag_name")" previous_tag="$(git describe --tags --abbrev=0 --exclude "$tag_name" "$current_commit" 2>/dev/null || true)" - command="DOCS_REPO_URL=git@github.com:yaozheng-fang/docs.git CODE_REPO_PATH=git@github.com:volcengine/veadk-python.git DOCS_PROJECT=veadk RELEASE_TAG=${tag_name} PREVIOUS_TAG=${previous_tag} OUTPUT_MODE=commit_and_pr bash scripts/run-docs-archive-on-tag.sh" + command="DOCS_REPO_URL=git@github.com:yaozheng-fang/docs.git CODE_REPO_PATH=git@github.com:volcengine/veadk-python.git DOCS_PROJECT=veadk RELEASE_TAG=${tag_name} PREVIOUS_TAG=${previous_tag} OUTPUT_MODE=commit_mr_and_merge PR_MERGE_AUTO=true bash scripts/run-docs-archive-on-tag.sh" payload="$(jq -n --arg command "$command" --arg cwd "." '{command: $command, cwd: $cwd, async: false}')" curl --fail --show-error --silent -X POST "$DOCS_AUTOGEN_URL" \ diff --git a/.github/workflows/push_doc_to_preview.yaml b/.github/workflows/push_doc_to_preview.yaml index b78884c6..d8f557d1 100644 --- a/.github/workflows/push_doc_to_preview.yaml +++ b/.github/workflows/push_doc_to_preview.yaml @@ -45,7 +45,7 @@ jobs: exit 1 fi - command="DOCS_REPO_URL=git@github.com:yaozheng-fang/docs.git CODE_REPO_PATH=git@github.com:volcengine/veadk-python.git DOCS_PROJECT=veadk BASE_REF=${BASE_REF} HEAD_REF=${HEAD_REF} OUTPUT_MODE=commit_and_mr bash scripts/run-docs-autogen.sh" + command="DOCS_REPO_URL=git@github.com:yaozheng-fang/docs.git CODE_REPO_PATH=git@github.com:volcengine/veadk-python.git DOCS_PROJECT=veadk BASE_REF=${BASE_REF} HEAD_REF=${HEAD_REF} OUTPUT_MODE=commit_mr_and_merge PR_MERGE_AUTO=true bash scripts/run-docs-autogen.sh" payload="$(jq -n --arg command "$command" --arg cwd "." '{command: $command, cwd: $cwd, async: false}')" curl --fail --show-error --silent -X POST "$DOCS_AUTOGEN_URL" \