Merge branch 'main' into dependabot/pip/mkdocs-material-9.4.11

HuangFuSL · Nov 24, 2023 · 55bdbad · 55bdbad
2 parents 4f81add + 131d264
commit 55bdbad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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