Merge branch 'master' into fix/merge-deny-ci-jobs

libp2p · Sep 3, 2023 · 6e4237a · 6e4237a
2 parents aea7328 + 7fd785e
commit 6e4237a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,6 +8,11 @@ updates:
     commit-message:
       prefix: "deps"
     rebase-strategy: "disabled"
+    groups:
+      trust-dns:
+        patterns:
+          - "trust-dns-*"
+          - "async-std-resolver"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,7 +59,7 @@ jobs:
           echo "code=${RESPONSE_CODE}" >> $GITHUB_OUTPUT
 
       - uses: ./.github/actions/cargo-semver-checks
-        if: steps.check-released.outputs.code == 200 && !contains(fromJSON('["libp2p-swarm-derive"]'), env.CRATE) # Workaround until https://github.com/obi1kenobi/cargo-semver-check/issues/146 is shipped.
+        if: steps.check-released.outputs.code == 200 && !contains(fromJSON('["libp2p-swarm-derive", "libp2p-server"]'), env.CRATE) # Workaround until https://github.com/obi1kenobi/cargo-semver-check/issues/146 is shipped.
         with:
           crate: ${{ env.CRATE }}
 

diff --git a/Cargo.lock b/Cargo.lock