From 0e8c1c46ee706bd6281dca183855f9f9853f0b0d Mon Sep 17 00:00:00 2001 From: Ryan May Date: Wed, 10 Jul 2024 13:58:15 -0700 Subject: [PATCH 1/5] CI: Add workflow to auto-merge dependabot PRs --- .github/workflows/automerge-dependabot.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/automerge-dependabot.yml diff --git a/.github/workflows/automerge-dependabot.yml b/.github/workflows/automerge-dependabot.yml new file mode 100644 index 0000000000..17d4dd7263 --- /dev/null +++ b/.github/workflows/automerge-dependabot.yml @@ -0,0 +1,21 @@ +name: Auto-merge Dependabot PRs + +on: + pull_request_target: + +jobs: + # + # Automatically review dependabot PRs and set them to automerge (on successful checks) + # + Automerge: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' + + permissions: + pull-requests: write + + steps: + - name: Set auto-merge + run: gh pr merge -R ${{ github.repository }} --merge --auto ${{ github.event.pull_request.number }} + - name: Review PR + run: gh pr review -R ${{ github.repository }} ${{ github.event.pull_request.number }} \ No newline at end of file From 479e12fbf90547fce0af9d14f29d774e5227e594 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Wed, 10 Jul 2024 14:08:09 -0700 Subject: [PATCH 2/5] CI: Fix missing token for GH CLI in dependabot workflow --- .github/workflows/automerge-dependabot.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/automerge-dependabot.yml b/.github/workflows/automerge-dependabot.yml index 17d4dd7263..3c2d58fd9a 100644 --- a/.github/workflows/automerge-dependabot.yml +++ b/.github/workflows/automerge-dependabot.yml @@ -10,6 +10,8 @@ jobs: Automerge: runs-on: ubuntu-latest if: github.actor == 'dependabot[bot]' + env: + GH_TOKEN: ${{ github.token }} permissions: pull-requests: write From 59987dc2ca98549d32a65b6d29a8b338f132cbcb Mon Sep 17 00:00:00 2001 From: Ryan May Date: Wed, 10 Jul 2024 14:29:27 -0700 Subject: [PATCH 3/5] CI: Fix token permissions on automerge job --- .github/workflows/automerge-dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automerge-dependabot.yml b/.github/workflows/automerge-dependabot.yml index 3c2d58fd9a..556e1c4138 100644 --- a/.github/workflows/automerge-dependabot.yml +++ b/.github/workflows/automerge-dependabot.yml @@ -14,6 +14,7 @@ jobs: GH_TOKEN: ${{ github.token }} permissions: + contents: write pull-requests: write steps: From b37cacf512cd7f2f3b1d3a4aa594ef40b72670d4 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Wed, 10 Jul 2024 14:33:18 -0700 Subject: [PATCH 4/5] CI: Fix missing --approve in dependabot autoreview --- .github/workflows/automerge-dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge-dependabot.yml b/.github/workflows/automerge-dependabot.yml index 556e1c4138..9438025f02 100644 --- a/.github/workflows/automerge-dependabot.yml +++ b/.github/workflows/automerge-dependabot.yml @@ -21,4 +21,4 @@ jobs: - name: Set auto-merge run: gh pr merge -R ${{ github.repository }} --merge --auto ${{ github.event.pull_request.number }} - name: Review PR - run: gh pr review -R ${{ github.repository }} ${{ github.event.pull_request.number }} \ No newline at end of file + run: gh pr review -R ${{ github.repository }} --approve ${{ github.event.pull_request.number }} \ No newline at end of file From 1df7241876f81fda34dbd6bb61a4dfc485ac6988 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 21:38:32 +0000 Subject: [PATCH 5/5] CI: (deps): Bump sphinx-design from 0.5.0 to 0.6.0 in /ci Bumps [sphinx-design](https://github.com/executablebooks/sphinx-design) from 0.5.0 to 0.6.0. - [Release notes](https://github.com/executablebooks/sphinx-design/releases) - [Changelog](https://github.com/executablebooks/sphinx-design/blob/main/CHANGELOG.md) - [Commits](https://github.com/executablebooks/sphinx-design/compare/v0.5.0...v0.6.0) --- updated-dependencies: - dependency-name: sphinx-design dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- ci/doc_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/doc_requirements.txt b/ci/doc_requirements.txt index 91035767db..757c23dbb4 100644 --- a/ci/doc_requirements.txt +++ b/ci/doc_requirements.txt @@ -1,6 +1,6 @@ sphinx==7.3.7 pydata-sphinx-theme==0.15.2 -sphinx-design==0.5.0 +sphinx-design==0.6.0 sphinx-gallery==0.16.0 myst-parser==3.0.1 netCDF4==1.7.1