From 92a79ea0dcf21f16bc75495cd40c06e6892a7adb Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 02:07:58 +0000 Subject: [PATCH] [workflow] Prepare for version 2024 (backport #5404) (#5405) [workflow] Prepare for version 2024 (#5404) * [automation] Prepare to version 2024 * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update PULL_REQUEST_TEMPLATE.md * Update translations.yml * Update PULL_REQUEST_TEMPLATE.md --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> (cherry picked from commit 70bf91d00657c3b0cbfec9027847b3573636a325) Co-authored-by: Hailin Wang --- .github/CONTRIBUTING.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 ++ .github/keylabeler.yml | 1 + .github/mergify.yml | 33 ++++++++++++++++++++++++++++++ .github/workflows/docs.yml | 4 ++-- .github/workflows/translations.yml | 20 ++++++++++++++++-- 6 files changed, 57 insertions(+), 5 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 281924eebd..91ee983ef8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -31,7 +31,7 @@ Here are a couple of friendly tutorials you can include: http://makeapullrequest Working on your first Pull Request? You can learn how from this _free_ series, [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github). -As a side note, it helps to use newcomer-friendly language throughout the rest of your document. Here are a couple of examples from [Active Admin](https://github.com/haiiliin/abqpy/blob/2023/CONTRIBUTING.md): +As a side note, it helps to use newcomer-friendly language throughout the rest of your document. Here are a couple of examples from [Active Admin](https://github.com/haiiliin/abqpy/blob/2024/CONTRIBUTING.md): At this point, you're ready to make your changes! Feel free to ask for help; everyone is a beginner at first :smile_cat: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 70833325fa..c12971396a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -19,3 +19,5 @@ Refer [here](https://github.com/haiiliin/abqpy/discussions/1500) to resolve back - [x] 2020 - [x] 2021 - [x] 2022 +- [x] 2023 +- [ ] 2024 diff --git a/.github/keylabeler.yml b/.github/keylabeler.yml index 5ee16003dd..390e9d651d 100644 --- a/.github/keylabeler.yml +++ b/.github/keylabeler.yml @@ -9,6 +9,7 @@ caseSensitive: false # Explicit keyword mappings to labels. Form of match:label. Required. labelMappings: + "- [x] 2024": backport-to-2024 "- [x] 2023": backport-to-2023 "- [x] 2022": backport-to-2022 "- [x] 2021": backport-to-2021 diff --git a/.github/mergify.yml b/.github/mergify.yml index 5aa76d8dec..945c927cb6 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,4 +1,37 @@ pull_request_rules: + - name: Backport to 2024 (auto-merge) + conditions: + - label=backport-to-2024 + - label!=disable-auto-merge + - label!=disable-auto-merge-2024 + actions: + backport: + title: "{{ title }} (backport #{{ number }})" + branches: + - "2024" + assignees: + - "{{ author }}" + labels: + - backport + - "2024" + - name: Backport to 2024 (disable-auto-merge) + conditions: + - label=backport-to-2024 + - or: + - label=disable-auto-merge + - label=disable-auto-merge-2024 + actions: + backport: + title: "{{ title }} (backport #{{ number }})" + branches: + - "2024" + assignees: + - "{{ author }}" + labels: + - backport + - "2024" + - disable-auto-merge + - name: Backport to 2023 (auto-merge) conditions: - label=backport-to-2023 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 20ac2670a3..9720214644 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: docs on: push: branches: - - "2023" + - "2024" paths: - "src/**" - "docs/source/**" @@ -11,7 +11,7 @@ on: - ".github/workflows/docs.yml" pull_request: branches: - - "2023" + - "2024" paths: - "src/**" - "docs/source/**" diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 1e6e22b9d9..ee6f7a36e8 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -12,7 +12,15 @@ jobs: fail-fast: true matrix: version: - ["2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023"] + - "2016" + - "2017" + - "2018" + - "2019" + - "2020" + - "2021" + - "2022" + - "2023" + - "2024" runs-on: ubuntu-latest steps: - name: Checkout the repository @@ -48,7 +56,15 @@ jobs: max-parallel: 1 matrix: version: - ["2016", "2017", "2018", "2019", "2020", "2021", "2022", "2023"] + - "2016" + - "2017" + - "2018" + - "2019" + - "2020" + - "2021" + - "2022" + - "2023" + - "2024" runs-on: ubuntu-latest steps: - name: Download Artifacts