Skip to content

Commit d87fa8c

Browse files
authored
Use direct commands to push pomerge changes
A workaround. Running 'make push' in older branch is using older Makefile, and that's not desired.
1 parent fa05783 commit d87fa8c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/update.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,15 @@ jobs:
175175
run: |
176176
powrap --modified -C ${{ matrix.branch }}
177177
178+
#TODO: Solve make push to work with merge scenario
178179
- name: Commit and push changes
179180
if: github.repository == 'python/python-docs-pt-br'
180181
run: |
181182
git config user.name github-actions
182183
git config user.email github-actions@github.com
183-
make push MSG="Merge ${{ env.CURRENT_BRANCH }} into ${{ matrix.branch }}"
184+
git diff -I'^"POT-Creation-Date: ' --numstat *.po **/*.po | cut -f3 | xargs -r git add
185+
git add $(git ls-files -o --exclude-standard *.po **/*.po) .tx/config
186+
git commit --allow-empty -m "Merge ${{ env.CURRENT_BRANCH }} into ${{ matrix.branch }}"
184187
working-directory: ${{ matrix.branch }}
185188

186189

@@ -190,4 +193,3 @@ jobs:
190193
needs: pull
191194
uses: ./.github/workflows/check.yml
192195
secrets: inherit
193-

0 commit comments

Comments
 (0)