Merge branch 'master' into fix_lit_docs

Author: SkafteNicki

.github/workflows/ci_dockers.yml

@@ -14,7 +14,7 @@ on: # Trigger the workflow on push or pull request, but only for the master bran
       - "environment.yml"
       - "requirements.txt"
       - ".github/workflows/ci_dockers.yml"
-      - ".github/workflows/nightly.yml"
+      - ".github/workflows/events-nightly.yml"
       - ".github/workflows/release-docker.yml"
       - "setup.py"
 

.github/workflows/nightly.yml renamed to .github/workflows/events-nightly.yml

@@ -0,0 +1,21 @@
+on:
+  # We recommend `pull_request_target` so that github secrets are available.
+  # In `pull_request` we wouldn't be able to change labels of fork PRs
+  pull_request_target:
+    types: [ synchronize ]
+
+jobs:
+
+  # This label will then be managed by this action.
+  #  It will be added to PRs with merge conflicts and removed from PRs without conflicts.
+  #  https://github.com/mschilde/auto-label-merge-conflicts
+  pr-label-conflicts:
+    name: Label PR conflits
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@v2
+        with:
+          CONFLICT_LABEL_NAME: "has conflicts"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAX_RETRIES: 3
+          WAIT_MS: 5000