From a21559dc2b1c75202abf367434cf7559695c917f Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Tue, 22 Nov 2022 23:19:09 +0100 Subject: [github actions] Permit to launch tests when backporting on maintenance branch (#7815) Remove changelog so we don't have to laboriously label everything "skip news" all the time. --- .github/workflows/backport.yml | 28 ++++++++++++++++++++++++++++ .github/workflows/changelog.yml | 3 ++- .github/workflows/checks.yaml | 2 +- .github/workflows/primer-test.yaml | 2 +- .github/workflows/primer_run_pr.yaml | 2 -- .github/workflows/tests.yaml | 2 +- 6 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/backport.yml (limited to '.github') diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml new file mode 100644 index 000000000..d2768fd25 --- /dev/null +++ b/.github/workflows/backport.yml @@ -0,0 +1,28 @@ +name: Backport +on: + pull_request_target: + types: + - closed + - labeled + +permissions: + pull-requests: write + +jobs: + backport: + name: Backport + runs-on: ubuntu-latest + # Only react to merged PRs for security reasons. + # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target. + if: > + github.event.pull_request.merged && ( + github.event.action == 'closed' + || ( + github.event.action == 'labeled' + && contains(github.event.label.name, 'backport') + ) + ) + steps: + - uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac + with: + github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 40b41ce9a..aa59fdec5 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -3,7 +3,8 @@ name: changelog on: pull_request: types: [opened, synchronize, labeled, unlabeled, reopened] - + branches-ignore: + - "maintenance/**" env: CACHE_VERSION: 1 KEY_PREFIX: base-venv diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 667cc3de1..4392e7a5c 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -4,7 +4,7 @@ on: push: branches: - main - - 2.* + - "maintenance/**" pull_request: ~ env: diff --git a/.github/workflows/primer-test.yaml b/.github/workflows/primer-test.yaml index a3c331f82..a0252bcf5 100644 --- a/.github/workflows/primer-test.yaml +++ b/.github/workflows/primer-test.yaml @@ -4,7 +4,7 @@ on: push: branches: - main - - 2.* + - "maintenance/**" pull_request: paths: - "pylint/**" diff --git a/.github/workflows/primer_run_pr.yaml b/.github/workflows/primer_run_pr.yaml index 5acf3791c..5116d2969 100644 --- a/.github/workflows/primer_run_pr.yaml +++ b/.github/workflows/primer_run_pr.yaml @@ -16,8 +16,6 @@ on: - "!.github/workflows/primer_run_main.yaml" - "!.github/workflows/primer_comment.yaml" - "!tests/primer/packages_to_prime.json" - branches-ignore: - - "maintenance/**" concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 703b1680c..17446b1c6 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -4,7 +4,7 @@ on: push: branches: - main - - 2.* + - "maintenance/**" pull_request: paths-ignore: - doc/data/messages/** -- cgit v1.2.1 From dff0adb0cafa8156a682596be3d7ad6ee0418e21 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Wed, 23 Nov 2022 09:18:03 +0100 Subject: Do not run primers tests on backporting branches --- .github/workflows/primer-test.yaml | 4 ++-- .github/workflows/primer_run_pr.yaml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/primer-test.yaml b/.github/workflows/primer-test.yaml index a0252bcf5..e85ac39fb 100644 --- a/.github/workflows/primer-test.yaml +++ b/.github/workflows/primer-test.yaml @@ -4,14 +4,14 @@ on: push: branches: - main - - "maintenance/**" pull_request: paths: - "pylint/**" - "tests/primer/**" - "requirements*" - ".github/workflows/primer-test.yaml" - + branches: + - main env: CACHE_VERSION: 1 KEY_PREFIX: venv diff --git a/.github/workflows/primer_run_pr.yaml b/.github/workflows/primer_run_pr.yaml index 5116d2969..4edfefc44 100644 --- a/.github/workflows/primer_run_pr.yaml +++ b/.github/workflows/primer_run_pr.yaml @@ -16,6 +16,8 @@ on: - "!.github/workflows/primer_run_main.yaml" - "!.github/workflows/primer_comment.yaml" - "!tests/primer/packages_to_prime.json" + branches: + - main concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} -- cgit v1.2.1 From 06d5d1a157ffda7207bda1b2c8410b4c63334f11 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Thu, 24 Nov 2022 19:51:54 +0100 Subject: Add ``content: write`` rights for backporting job (#7826) * Do not run primers tests on backporting branches * Add content: write rights for backporting job We need it to push to the backporting branch after cherry-picking See https://github.com/PyCQA/pylint/pull/7810\#issuecomment-1324742960 * [github actions] Add a version comment so the tag is clearer Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> --- .github/workflows/backport.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index d2768fd25..4c2639b50 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -7,6 +7,7 @@ on: permissions: pull-requests: write + contents: write jobs: backport: @@ -23,6 +24,6 @@ jobs: ) ) steps: - - uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac + - uses: tibdex/backport@2e217641d82d02ba0603f46b1aeedefb258890ac # v2.0.3 with: github_token: ${{ secrets.GITHUB_TOKEN }} -- cgit v1.2.1 From ebf282437ece32158991fbcfd562797cc9ff7e10 Mon Sep 17 00:00:00 2001 From: Pierre Sassoulas Date: Thu, 24 Nov 2022 22:58:54 +0100 Subject: Execute tests on maintenance branche's PR --- .github/workflows/tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 17446b1c6..9d741197c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -5,9 +5,9 @@ on: branches: - main - "maintenance/**" - pull_request: paths-ignore: - doc/data/messages/** + pull_request: ~ env: CACHE_VERSION: 1 -- cgit v1.2.1