From 50065df82629e3e59e9c344abb5fc471a58bb7a7 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 9 Feb 2024 11:32:55 +0100 Subject: [PATCH 1/3] ci: simplify Mergify configuration and automerge dependabot (#443) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .mergify.yml | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index a9d99e9..daa56f2 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,6 +1,7 @@ queue_rules: - name: default - conditions: &CheckRuns + merge_method: squash + queue_conditions: &CheckRuns - "check-success=test (3.8, py38)" - "check-success=test (3.9, py39)" - "check-success=test (3.10, py310)" @@ -20,42 +21,28 @@ pull_request_rules: ⚠️ No release notes detected. Please make sure to use [reno](https://docs.openstack.org/reno/latest/user/usage.html) to add a changelog entry. + - name: automatic merge without changelog conditions: - - and: *CheckRuns - - "#approved-reviews-by>=1" - - label=no-changelog + - or: + - author=jd + - author=dependabot + - "#approved-reviews-by>=1" + - or: + - label=no-changelog + - author=dependabot actions: queue: - name: default - method: squash + - name: automatic merge with changelog conditions: - - and: *CheckRuns - - "#approved-reviews-by>=1" - - files~=^releasenotes/notes/ - actions: - queue: - name: default - method: squash - - name: automatic merge for jd without changelog - conditions: - - author=jd - - and: *CheckRuns - - label=no-changelog - actions: - queue: - name: default - method: squash - - name: automatic merge for jd with changelog - conditions: - - author=jd - - and: *CheckRuns + - or: + - author=jd + - "#approved-reviews-by>=1" - files~=^releasenotes/notes/ actions: queue: - name: default - method: squash + - name: dismiss reviews conditions: [] actions: From 9ed3e964839d588eb696e9b8e68cd9e96751bdd1 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 9 Feb 2024 11:40:19 +0100 Subject: [PATCH 2/3] ci(mergify): add missing [bot] for dependabot (#446) --- .mergify.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index daa56f2..8180bed 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -26,11 +26,11 @@ pull_request_rules: conditions: - or: - author=jd - - author=dependabot + - author=dependabot[bot] - "#approved-reviews-by>=1" - or: - label=no-changelog - - author=dependabot + - author=dependabot[bot] actions: queue: From cf58675e9c5d8e002272e8e5bbdbd6ac14f69920 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:00:22 +0000 Subject: [PATCH 3/3] chore(deps): bump the github-actions group with 2 updates (#441) Bumps the github-actions group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [actions/setup-python](https://github.com/actions/setup-python). Updates `actions/checkout` from 4.0.0 to 4.1.1 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.0.0...v4.1.1) Updates `actions/setup-python` from 4.7.0 to 5.0.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4.7.0...v5.0.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/deploy.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4bd620f..a0b311f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -35,12 +35,12 @@ jobs: tox: mypy steps: - name: Checkout 🛎️ - uses: actions/checkout@v4.0.0 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 - name: Setup Python 🔧 - uses: actions/setup-python@v4.7.0 + uses: actions/setup-python@v5.0.0 with: python-version: ${{ matrix.python }} allow-prereleases: true diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index db4ee53..15c0dfe 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -11,12 +11,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: actions/checkout@v4.0.0 + uses: actions/checkout@v4.1.1 with: fetch-depth: 0 - name: Setup Python 🔧 - uses: actions/setup-python@v4.7.0 + uses: actions/setup-python@v5.0.0 with: python-version: 3.11