Merge branch 'main' into ssx_isigma_filter

jbeilstenedmands · Aug 19, 2024 · 19d993f · 19d993f
2 parents 2337fc2 + 58a3734
commit 19d993f
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/.github/workflows/merge-conflicts.yml b/.github/workflows/merge-conflicts.yml
@@ -11,14 +11,11 @@ on:
 
 jobs:
   label:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
     - name: Label Conflicting Pull Requests
-      uses: eps1lon/actions-label-merge-conflict@72a2cf9eb9640428abbd99bc0aa6dd522073b9d3
-            # This is tagged version v1.2.3, but do not use version tags
-            # https://julienrenaux.fr/2019/12/20/github-actions-security-risk/
+      uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168
       with:
         dirtyLabel: 'PR: merge conflicts'
-        removeOnDirtyLabel: 'PR: ready to ship'
         repoToken: ${{ secrets.GITHUB_TOKEN }}