fix ci-label and ci-changelog gha race condition (#1094)

bjlittle · Sep 9, 2024 · f66d2da · f66d2da
1 parent 0f6625e
commit f66d2da
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -16,3 +16,4 @@ updates:
     labels:
       - "new: pull request"
       - "bot"
+      - "skip changelog"
diff --git a/.github/workflows/ci-changelog.yml b/.github/workflows/ci-changelog.yml
@@ -37,6 +37,7 @@ jobs:
       run:
         shell: bash -l {0}
 
+    if: github.actor != 'pre-commit-ci[bot]'
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/.github/workflows/ci-label.yml b/.github/workflows/ci-label.yml
@@ -22,6 +22,12 @@ jobs:
 
       - uses: actions/labeler@v5
 
+      - uses: actions-ecosystem/action-add-labels@18f1af5e3544586314bbe15c0273249c770b2daf
+        if: github.actor == 'dependabot[bot]' || github.actor == 'geovista-ci[bot]' || github.actor == 'pre-commit-ci[bot]'
+        with:
+          github_token: ${{ github.token }}
+          labels: 'skip changelog'
+
       - uses: actions-ecosystem/action-add-labels@18f1af5e3544586314bbe15c0273249c770b2daf
         if: startsWith(github.event.pull_request.head.ref, 'breaking-change') || startsWith(github.event.pull_request.head.ref, 'breaking') || startsWith(github.event.pull_request.head.ref, 'break')
         with:
@@ -70,12 +76,6 @@ jobs:
           github_token: ${{ github.token }}
           labels: 'type: performance'
 
-      - uses: actions-ecosystem/action-add-labels@18f1af5e3544586314bbe15c0273249c770b2daf
-        if: github.actor == 'dependabot[bot]' || github.actor == 'geovista-ci[bot]' || github.actor == 'pre-commit-ci[bot]'
-        with:
-          github_token: ${{ github.token }}
-          labels: 'skip changelog'
-
       - uses: actions-ecosystem/action-add-labels@18f1af5e3544586314bbe15c0273249c770b2daf
         if: startsWith(github.event.pull_request.head.ref, 'merge-back') || startsWith(github.event.pull_request.head.ref, 'mb')
         with:

diff --git a/.github/workflows/ci-locks.yml b/.github/workflows/ci-locks.yml
@@ -135,6 +135,7 @@ jobs:
         labels: |
           new: pull request
           bot
+          skip changelog
 
     - name: "show pull-request"
       if: steps.cpr.outputs.pull-request-number != ''

diff --git a/changelog/1094.internal.rst b/changelog/1094.internal.rst
@@ -0,0 +1,2 @@
+Add the ``skip changelog`` label to ``dependabot`` and ``ci-locks`` :fab:`github`
+Action generated pull-requests. (:user:`bjlittle`)