Merge branch 'develop' into develop

OpenShot · Sep 20, 2020 · 4e98fb7 · 4e98fb7
2 parents 66121bf + 7c9e3f5
commit 4e98fb7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -0,0 +1,4 @@
+# Add 'build' label to CMake changes
+build:
+  - /**/CMakeList.txt
+  - /cmake/**/*.cmake
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -0,0 +1,19 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler/blob/master/README.md
+
+name: Labeler
+on: [pull_request]
+
+jobs:
+  label:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/labeler@v2
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/cmake/Modules/FindZMQ.cmake b/cmake/Modules/FindZMQ.cmake