From 67688490959cea651c0f0ba6313f670b35d7eba0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 18:30:42 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.1.11 → v0.1.13](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.11...v0.1.13) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 449f2c0..b24375d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,7 +12,7 @@ repos: - id: black-jupyter language_version: python3 - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.1.11" + rev: "v0.1.13" hooks: - id: ruff args: ["--fix"] From e4fd04cdd358b4cdee3c628faeb5fb0073d8395d Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 15 Jan 2024 11:40:54 -0800 Subject: [PATCH 2/2] update ci --- .github/workflows/automerge.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index fb0ab00..bde299b 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -8,16 +8,15 @@ jobs: auto-merge: runs-on: ubuntu-latest steps: + - name: Label PR + if: github.event.pull_request.title == '[pre-commit.ci] pre-commit autoupdate' + run: | + curl -X POST \ + -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels \ + -d '{"labels":["automerge"]}' - name: Automatic Merge uses: pascalgn/automerge-action@v0.16.2 - if: github.event.pull_request.title == '[pre-commit.ci] pre-commit autoupdate' - with: + env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - MERGE_LABELS: "" - MERGE_REMOVE_LABELS: "auto-merge" - MERGE_METHOD: "squash" - MERGE_COMMIT_MESSAGE: "pull-request-title" - MERGE_FORKS: false - MERGE_RETRIES: "6" - MERGE_RETRY_SLEEP: "10000" - MERGE_DELETE_BRANCH: true