8000 fix merge problems. · python/python-docs-zh-tw@0debbeb · GitHub
[go: up one dir, main page]
Skip to content

Commit 0debbeb

Browse files
StevenHsuYLStevenHsuYL
committed
fix merge problems.
Restore the other two files.
1 parent 6e46dd4 commit 0debbeb

File tree

2 files changed

+64
-3
lines changed

2 files changed

+64
-3
lines changed

‎.github/workflows/py310-sync-cpython.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: python-3.10-sync-with-cpython
2+
3+
on:
4+
push:
5+
branches:
6+
- "3.10"
7+
schedule:
8+
- cron: "0 0 * * *"
9+
10+
jobs:
11+
sync:
12+
runs-on: ubuntu-latest
13+
env:
14+
VERSION: "3.10"
15+
BRANCH: "cron/sync/3.10"
16+
steps:
17+
- uses: actions/checkout@v2
18+
with:
19+
ref: ${{ env.VERSION }}
20+
21+
- name: Get the changes on branch (if exists)
22+
continue-on-error: true
23+
run: |
24+
git fetch origin ${{ env.BRANCH }}:${{ env.BRANCH }}
25+
git reset --hard ${{ env.BRANCH }}
26+
27+
- name: Set env
28+
run: echo "LATEST_COMMIT_ID=$(git ls-remote https://github.com/python/CPython.git $VERSION | head -c 8)" >> $GITHUB_ENV
29+
30+
- name: Install Dependencies
31+
run: sudo apt-get install gettext
32+
33+
- name: Sync with CPython
34+
run: make clone && make merge && make rm_cpython
35+
36+
- uses: tibdex/github-app-token@v1
37+
id: generate-token
38+
with:
39+
app_id: ${{ secrets.APP_ID }}
40+
private_key: ${{ secrets.APP_PRIVATE_KEY }}
41+
42+
- name: Create Pull Request
43+
id: cpr
44+
uses: peter-evans/create-pull-request@v3
45+
with:
46+
token: ${{ steps.generate-token.outputs.token }}
47+
commit-message: sync with cpython ${{ env.LATEST_COMMIT_ID }}
48+
committer: GitHub <noreply@github.com>
49+
author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
50+
base: ${{ env.VERSION }}
51+
branch: ${{ env.BRANCH }}
52+
delete-branch: false
53+
title: 'Sync with CPython ${{ env.VERSION }}'
54+
body: |
55+
Sync with CPython ${{ env.VERSION }}
56+
draft: true
57+
labels: |
58+
sync-cpython
59+
automation
60+
61+
- name: Check outputs
62+
run: |
63+
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
64+
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
*.mo
22
__pycache__
33
.DS_Store
4-
Makefile
5-
6-
.github/workflows/

0 commit comments

Comments
 (0)
0