Skip to content

Commit ae536b6

Browse files
authored
fixed PythonDocker rerun matrix gating and gh setup (#38199)
1 parent d6fd069 commit ae536b6

3 files changed

Lines changed: 4 additions & 11 deletions

File tree

.github/actions/rerun-job-action/action.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,7 @@ runs:
114114
-s $URL
115115
- name: Install GH Cli
116116
if: ${{env.rerun != 'false' }}
117-
shell: bash
118-
run: |
119-
wget https://github.com/cli/cli/releases/download/v2.31.0/gh_2.31.0_linux_amd64.tar.gz
120-
tar -xvf gh_2.31.0_linux_amd64.tar.gz
121-
sudo mv gh_2.31.0_linux_amd64/bin/gh /usr/local/bin
117+
uses: ./.github/actions/setup-gh-cli-linux
122118
- name: Exit rest of the run
123119
if: ${{env.rerun != 'false' }}
124120
shell: bash

.github/workflows/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ jobs:
104104
github.event_name == 'pull_request_target' ||
105105
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
106106
github.event_name == 'workflow_dispatch' ||
107-
startsWith(github.event.comment.body, 'Run Job With Matrix')
107+
(github.event_name == 'issue_comment' && github.event.comment.body == format('{0} {1}', matrix.job_phrase, matrix.python_version))
108108
steps:
109109
- uses: actions/checkout@v3
110110
- name: Setup repository
111111
uses: ./.github/actions/setup-action
112112
with:
113-
comment_phrase: ${{ matrix.job_phrase }}
113+
comment_phrase: ${{ matrix.job_phrase }} ${{ matrix.python_version }}
114114
github_token: ${{ secrets.GITHUB_TOKEN }}
115115
github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
116116
```

.github/workflows/beam_PreCommit_PythonDocker.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ on:
1818
pull_request_target:
1919
branches: [ "master", "release-*" ]
2020
paths: [ "model/**","sdks/python/**","release/**", 'release/trigger_all_tests.json', '.github/trigger_files/beam_PreCommit_PythonDocker.json']
21-
issue_comment:
22-
types: [created]
2321
push:
2422
tags: ['v*']
2523
branches: ['master', 'release-*']
@@ -69,8 +67,7 @@ jobs:
6967
github.event_name == 'push' ||
7068
github.event_name == 'pull_request_target' ||
7169
github.event_name == 'workflow_dispatch' ||
72-
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
73-
startsWith(github.event.comment.body, 'Run PythonDocker PreCommit')
70+
(github.event_name == 'schedule' && github.repository == 'apache/beam')
7471
steps:
7572
- uses: actions/checkout@v4
7673
- name: Setup repository

0 commit comments

Comments
 (0)