From f94775fd2e60e93bbbff5afa4eb6866d4ef21a0b Mon Sep 17 00:00:00 2001 From: HuangFuSL Date: Fri, 24 Nov 2023 12:28:06 +0800 Subject: [PATCH] Fix: dependabot automerge --- .github/workflows/dependencies.yml | 5 ++++- .github/workflows/test.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index fd59358d2..d6baf5cda 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -10,7 +10,9 @@ on: jobs: dependencies: name: Update dependencies - if: contains(github.event.pull_request.labels.*.name, 'ready') == true + if: >- + contains(github.event.pull_request.labels.*.name, 'ready') == true || + contains(github.event.pull_request.labels.*.name, 'dependencies') == true runs-on: self-hosted permissions: contents: write @@ -38,6 +40,7 @@ jobs: ~/build/bin/python -m pip install -U -r requirements.txt - name: Merge PR + if: github.event.pull_request.merged == false run: | echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token gh pr merge ${{ github.event.number }} -d -R ${{ github.repository }} --merge diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c624db214..dfb150e3c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,6 +31,7 @@ jobs: make build PYTHON=~/build/bin/python3 TEXINPUTS=$PWD/third_party//: PATH=~/.local/texlive/2023/bin/x86_64-linux:$PATH - name: Merge PR + if: github.event.pull_request.merged == false run: | echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token gh pr merge ${{ github.event.number }} -d -R ${{ github.repository }} --merge \ No newline at end of file