diff --git a/.travis.yml b/.travis.yml index da8517faa..555ec2b13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,23 +16,28 @@ go: "1.14.x" matrix: include: - - os: linux - arch: amd64 - env: - - NPROC=2 - before_install: - - export GOPATH=$HOME/go - ## arm64 is very unreliable and slow, disabled for now + # Due to Travis new pricing we want to dedicate the resources we have + # for ARM64 testing, hence Linux/Mac on AMD are commented out + # https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing + # - os: linux - # arch: arm64 + # arch: amd64 # env: - # - NPROC=6 # Worth trying more than 2 parallel jobs: https://travis-ci.community/t/no-cache-support-on-arm64/5416/8 - # # (also used to get a different cache key than the amd64 one) + # - NPROC=2 # before_install: # - export GOPATH=$HOME/go - - os: osx + # - os: osx + # env: + # - NPROC=2 + # before_install: + # - export GOPATH=$HOME/go + + - os: linux + dist: bionic + arch: arm64 env: - - NPROC=2 + - NPROC=6 # Worth trying more than 2 parallel jobs: https://travis-ci.community/t/no-cache-support-on-arm64/5416/8 + # (also used to get a different cache key than the amd64 one) before_install: - export GOPATH=$HOME/go @@ -51,4 +56,3 @@ script: - nimble install -y --depsOnly - nimble test - nimble examples_build - diff --git a/libp2p/crypto/BearSSL b/libp2p/crypto/BearSSL new file mode 160000 index 000000000..c1bb5356b --- /dev/null +++ b/libp2p/crypto/BearSSL @@ -0,0 +1 @@ +Subproject commit c1bb5356bb52984178c269886b6835b532ef30c2