Merge branch 'main' into chore/run-propagator-dialyzer-on-gh-actions

open-telemetry · Dec 12, 2023 · 85764b2 · 85764b2
2 parents 4cf76ee + 8af382e
commit 85764b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -5,6 +5,6 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@main
+    - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/renovate.json b/renovate.json
@@ -6,8 +6,7 @@
   "packageRules": [
     {
       "matchDatasources": ["hex"],
-      "matchUpdateTypes": ["patch", "pin", "digest"],
-      "automerge": true,
+      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
       "addLabels": ["skip-changelog"]
     }
   ]