Skip to content

Commit

Permalink
Merge branch 'master' into tests-dcutr-gossipsub
Browse files Browse the repository at this point in the history
  • Loading branch information
jxs authored Nov 8, 2024
2 parents 02153ad + 4192fc3 commit 1e593f0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/interop-test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Interoperability Testing
on:
pull_request:
push:
branches:
- "master"
Expand Down
2 changes: 1 addition & 1 deletion protocols/autonat/src/v2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//! server then the dial back puts on the client, thus making the protocol unatractive for an
//! attacker.
//!
//! The protocol is seperated into two parts:
//! The protocol is separated into two parts:
//! - The client part, which is implemented in the `client` module. (The client is the party that
//! wants to check if it is reachable from the outside.)
//! - The server part, which is implemented in the `server` module. (The server is the party
Expand Down
2 changes: 1 addition & 1 deletion protocols/identify/src/behaviour.rs
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ impl Behaviour {
}

// outgoing connection dialed with port reuse
// incomming connection
// incoming connection
self.events
.push_back(ToSwarm::NewExternalAddrCandidate(observed.clone()));
}
Expand Down
4 changes: 2 additions & 2 deletions scripts/build-interop-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ CACHE_TO=""

# If we have credentials, write to cache
if [[ -n "${AWS_SECRET_ACCESS_KEY}" ]]; then
CACHE_TO="--cache-to type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=us-east-1,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head"
CACHE_TO="--cache-to type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=ap-southeast-2,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head"
fi

docker buildx build \
--load \
$CACHE_TO \
--cache-from type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=us-east-1,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head \
--cache-from type=s3,mode=max,bucket=${AWS_BUCKET_NAME},region=ap-southeast-2,prefix=buildCache,name=${FLAVOUR}-rust-libp2p-head \
-t ${FLAVOUR}-rust-libp2p-head \
. \
-f interop-tests/Dockerfile.${FLAVOUR}

0 comments on commit 1e593f0

Please sign in to comment.