Merge branch 'master' of github.com:libp2p/rust-libp2p into feat/add-…

…connection-timeout-to-swarm-builder
libp2p · Dec 13, 2024 · 2caa95d · 2caa95d
2 parents 96c6e64 + d7b66a7
commit 2caa95d
Show file tree

Hide file tree

Showing 434 changed files with 8,155 additions and 5,438 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -32,6 +32,17 @@ pull_request_rules:
       - base=master
     actions:
       queue:
+        name: default
+
+  # Adds the Pr to the batch queue, so that we can run the interop tests. See the `external_prs` queue for more info.
+  - name: Add to batch merge queue
+    conditions:
+      # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
+      - label=send-it-batch
+      - base=master
+    actions:
+      queue:
+        name: external_prs
 
   - name: Add approved dependabot PRs to merge queue
     conditions:
@@ -40,6 +51,7 @@ pull_request_rules:
       - base=master
     actions:
       queue:
+        name: default
 
   - name: Remove reviews on updates after PR is queued for merging
     conditions:
@@ -74,3 +86,8 @@ pull_request_rules:
 queue_rules:
   - name: default
     conditions: []
+  # External PR's don't have access to secrets and variables, therefore they don't run the interop tests.
+  # using a batch queue allows to circumvent that as mergify creates it from an internal branch.
+  - name: external_prs
+    conditions: []
+    batch_size: 1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -225,7 +225,7 @@ jobs:
       fail-fast: false
       matrix:
         rust-version: [
-          1.80.0, # current stable
+          1.83.0, # current stable
           beta,
         ]
     steps:
@@ -308,7 +308,7 @@ jobs:
       RUSTFLAGS: ''
     steps:
       - uses: actions/checkout@v4
-      - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.33.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
+      - run: wget -q -O- https://github.com/obi1kenobi/cargo-semver-checks/releases/download/v0.36.0/cargo-semver-checks-x86_64-unknown-linux-gnu.tar.gz | tar -xz -C ~/.cargo/bin
         shell: bash
       - uses: obi1kenobi/cargo-semver-checks-action@7272cc2caa468d3e009a2b0a9cc366839348237b # v2.6
 

diff --git a/.github/workflows/interop-test.yml b/.github/workflows/interop-test.yml
@@ -1,5 +1,6 @@
 name: Interoperability Testing
 on:
+  pull_request:
   push:
     branches:
       - "master"
@@ -27,6 +28,7 @@ jobs:
           AWS_BUCKET_NAME: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }}
           AWS_ACCESS_KEY_ID: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_REGION }}
           FLAVOUR: ${{ matrix.flavour }}
 
       - name: Run ${{ matrix.flavour }} tests
@@ -37,6 +39,7 @@ jobs:
           s3-cache-bucket: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }}
           s3-access-key-id: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }}
           s3-secret-access-key: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_REGION }}
           worker-count: 16
   run-holepunching-interop:
     name: Run hole-punch interoperability tests
@@ -55,4 +58,5 @@ jobs:
           s3-cache-bucket: ${{ vars.S3_LIBP2P_BUILD_CACHE_BUCKET_NAME }}
           s3-access-key-id: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_ACCESS_KEY_ID }}
           s3-secret-access-key: ${{ secrets.S3_LIBP2P_BUILD_CACHE_AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ vars.S3_LIBP2P_BUILD_CACHE_AWS_REGION }}
           worker-count: 16