Merge pull request #108 from mattwang44/improve-github-action

mattwang44 · web-flow · commit 9c342304a268 · 2021-09-10T14:04:25.000+08:00
Improve GitHub action workflows
diff --git 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 <noreply@github.com>
           author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@@ -39,12 +46,10 @@ jobs:
           title: 'Sync with CPython ${{ env.VERSION }}'
           body: |
             Sync with CPython ${{ env.VERSION }}
+          draft: true
           labels: |
             sync-cpython
             automation
-          team-reviewers: |
-            owners
-            maintainers
           
       - name: Check outputs
         run: |
diff --git 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
 
diff --git 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`_
 
