From 7fedc5fdb7c10e02b29e7767bf519170bcbabadc Mon Sep 17 00:00:00 2001 From: "Matt.Wang" Date: Wed, 8 Sep 2021 19:21:31 +0800 Subject: [PATCH 1/5] chore: insert `Language` header entry when merging from CPython doc --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f8e256f82f..3e64cdd0fa 100644 --- a/Makefile +++ b/Makefile @@ -84,11 +84,11 @@ endif if [ -f "$$PO" ];\ then\ case "$$POT" in\ - *whatsnew*) msgmerge --backup=off --force-po --no-fuzzy-matching -U "$$PO" "$$POT" ;;\ - *) msgmerge --backup=off --force-po -U "$$PO" "$$POT" ;;\ + *whatsnew*) msgmerge --lang=$(LANGUAGE) --backup=off --force-po --no-fuzzy-matching -U "$$PO" "$$POT" ;;\ + *) msgmerge --lang=$(LANGUAGE) --backup=off --force-po -U "$$PO" "$$POT" ;;\ esac\ else\ - msgcat -o "$$PO" "$$POT";\ + msgcat --lang=$(LANGUAGE) -o "$$PO" "$$POT";\ fi\ done From a01692db7c7355864abf3d9d0ec6f4993392779c Mon Sep 17 00:00:00 2001 From: "Matt.Wang" Date: Wed, 8 Sep 2021 19:24:12 +0800 Subject: [PATCH 2/5] chore(doc): update the link for current translated doc --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 3c185aa1ac..e23a9e27f0 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ Python 官方說明文件臺灣繁體中文翻譯計畫 翻譯之前，請務必詳讀並同意\ `授權與 License`_。參與方式請參考\ `參加翻譯`_。 -您可以在 https://python-doc-tw.github.io/ 瀏覽目前翻譯的成果。 +您可以在 https://python.github.io/python-docs-zh-tw/ 瀏覽目前翻譯的成果。 想問問題、認識翻譯同好，歡迎加入 Telegram 聊天室 `t.me/PyDocTW`_ From ce5c2ebb35de783781aec2a3bad7bc05119d7ea7 Mon Sep 17 00:00:00 2001 From: "Matt.Wang" Date: Wed, 8 Sep 2021 19:32:08 +0800 Subject: [PATCH 3/5] chore: send cpython-syncing PR as a draft --- .github/workflows/py39-sync-cpython.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/py39-sync-cpython.yml b/.github/workflows/py39-sync-cpython.yml index 4f06711940..0ddd7ba332 100644 --- a/.github/workflows/py39-sync-cpython.yml +++ b/.github/workflows/py39-sync-cpython.yml @@ -39,6 +39,7 @@ jobs: title: 'Sync with CPython ${{ env.VERSION }}' body: | Sync with CPython ${{ env.VERSION }} + draft: true labels: | sync-cpython automation From 3da23ec1c6abeb81dfc8c90cf6172d80d3fad3f5 Mon Sep 17 00:00:00 2001 From: "Matt.Wang" Date: Wed, 8 Sep 2021 19:38:31 +0800 Subject: [PATCH 4/5] chore: remove reviewer for cpython-syncing PR Remove the configuration since it will assign accounts that is in python core team but not in pydoc-zh-tw as a reviewer. --- .github/workflows/py39-sync-cpython.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/py39-sync-cpython.yml b/.github/workflows/py39-sync-cpython.yml index 0ddd7ba332..5fd6b7a847 100644 --- a/.github/workflows/py39-sync-cpython.yml +++ b/.github/workflows/py39-sync-cpython.yml @@ -43,9 +43,6 @@ jobs: labels: | sync-cpython automation - team-reviewers: | - owners - maintainers - name: Check outputs run: | From 212beef9d4f7b7b3b1c30e68667ec3da7c749ef2 Mon Sep 17 00:00:00 2001 From: "Matt.Wang" Date: Wed, 8 Sep 2021 20:31:30 +0800 Subject: [PATCH 5/5] chore: insert github app token for triggering ci on automation PR --- .github/workflows/py39-sync-cpython.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/py39-sync-cpython.yml b/.github/workflows/py39-sync-cpython.yml index 5fd6b7a847..13b4214b61 100644 --- a/.github/workflows/py39-sync-cpython.yml +++ b/.github/workflows/py39-sync-cpython.yml @@ -26,10 +26,17 @@ jobs: - name: Sync with CPython run: make clone && make merge && make rm_cpython + - uses: tibdex/github-app-token@v1 + id: generate-token + with: + app_id: ${{ secrets.APP_ID }} + private_key: ${{ secrets.APP_PRIVATE_KEY }} + - name: Create Pull Request id: cpr uses: peter-evans/create-pull-request@v3 with: + token: ${{ steps.generate-token.outputs.token }} commit-message: sync with cpython ${{ env.LATEST_COMMIT_ID }} committer: GitHub author: github-actions[bot]