@@ -22,18 +22,17 @@ jobs:
2222runs-on :ubuntu-latest
2323steps :
2424 -name :Check out ${{ github.repository }}
25- uses :actions/checkout@v3
25+ uses :actions/checkout@v4
2626 -name :Check out CPython
27- uses :actions/checkout@v3
27+ uses :actions/checkout@v4
2828with :
2929repository :python/cpython
3030persist-credentials :false
3131ref :${{ env.CPYTHON_BRANCH }}
3232path :cpython
3333 -name :Set up Python
34- uses :actions/setup-python@v4
34+ uses :actions/setup-python@v5
3535with :
36- python-version :' 3.13'
3736cache :' pip'
3837cache-dependency-path :' **/requirements*.txt'
3938 -name :Install Transifex CLI
4241working-directory :/usr/local/bin
4342 -name :Install dependencies
4443run :|
45- sudo apt update -y && sudo apt install gettext -y
44+ sudo apt-get update -y && sudo apt-get install gettext -y
4645 pip install --upgrade pip
4746 pip install -r requirements.txt -r cpython/Doc/requirements.txt
4847name :Update translations
@@ -74,52 +73,46 @@ jobs:
7473strategy :
7574matrix :
7675branch :[ "3.13", "3.12", "3.11" ]
77- include :
78- -branch :" 3.14"
79- overwrite :true
76+
8077runs-on :ubuntu-latest
8178steps :
82- -name :Get current branch name
83- shell :bash
84- run :
85- echo "CURRENT_BRANCH=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
86- -name :Check out source branch (${{ env.CURRENT_BRANCH }})
87- uses :actions/checkout@v3
79+ -name :Check out source branch (${{ env.CPYTHON_BRANCH }})
80+ uses :actions/checkout@v4
8881with :
89- path :${{ env.CURRENT_BRANCH }}
82+ path :${{ env.CPYTHON_BRANCH }}
83+
9084 -name :Check out target branch (${{ matrix.branch }})
91- uses :actions/checkout@v3
85+ uses :actions/checkout@v4
9286with :
9387ref :${{ matrix.branch }}
9488path :${{ matrix.branch }}
89+
9590 -name :Set up Python
96- uses :actions/setup-python@v4
91+ uses :actions/setup-python@v5
9792with :
98- python-version :' 3.13'
9993cache :' pip'
10094cache-dependency-path :' **/requirements*.txt'
95+
10196 -name :Install dependencies
10297run :|
103- sudo apt update -y && sudo apt install gettext -y
98+ sudo apt-get update -y && sudo apt-get install gettext -y
10499 pip install pomerge powrap
100+
105101name :Merge overwriting on stable release branch
106- if :${{ matrix.overwrite == true }}
107- run :|
108- pomerge --from ${{ env.CURRENT_BRANCH }}/**/*.po --to ${{ matrix.branch }}/**/*.po
109- name :Merge without overwriting on EOL or security-fix release branch
110- if :${{ matrix.overwrite != true }}
111102run :|
112- pomerge --no-overwrite --from ${{ env.CURRENT_BRANCH }}/**/*.po --to ${{ matrix.branch }}/**/*.po
103+ pomerge --from "${{ env.CPYTHON_BRANCH }}/**/*.po" --to "${{ matrix.branch }}/**/*.po"
104+
113105name :Wrap catalog message files
114106run :|
115- powrap --modified -C ${{ matrix.branch }}
107+ powrap --modified -C "${{ matrix.branch }}"
108+
116109name :Commit and push changes
117110if :github.repository == 'python/python-docs-ja'
118111run :|
119- cd ${{ matrix.branch }}
112+ cd" ${{ matrix.branch }}"
120113 git config user.name github-actions
121114 git config user.email github-actions@github.com
122115 git status
123116 git add -A
124- git diff-index --quiet HEAD || ( git commit -m "Merge ${{ env.CURRENT_BRANCH }} into ${{ matrix.branch }}" && git push )
117+ git diff-index --quiet HEAD || ( git commit -m "Merge ${{ env.CPYTHON_BRANCH }} into ${{ matrix.branch }}" && git push )
125118