diff --git a/Dockerfile b/Dockerfile index c92c5c09425..f20299cf9f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ # Changes to the minimum golang version must also be replicated in -# scripts/build_avalanche.sh # tests/antithesis/Dockerfile.node # tests/antithesis/Dockerfile.workload # Dockerfile (here) diff --git a/go.mod b/go.mod index 0d952c79271..a6281f529c2 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,12 @@ module github.com/ava-labs/avalanchego // Changes to the minimum golang version must also be replicated in -// scripts/build_avalanche.sh // tests/antithesis/Dockerfile.node // tests/antithesis/Dockerfile.workload // Dockerfile // README.md -// go.mod (here, only major.minor can be specified) -go 1.21 +// go.mod (here) +go 1.21.9 require ( github.com/DataDog/zstd v1.5.2 diff --git a/scripts/build_avalanche.sh b/scripts/build_avalanche.sh index 54add16a184..74ec675e236 100755 --- a/scripts/build_avalanche.sh +++ b/scripts/build_avalanche.sh @@ -22,37 +22,6 @@ while getopts 'r' flag; do esac done -# Changes to the minimum golang version must also be replicated in -# scripts/build_avalanche.sh (here) -# tests/antithesis/Dockerfile.node -# tests/antithesis/Dockerfile.workload -# Dockerfile -# CONTRIBUTING.md -# README.md -# go.mod -go_version_minimum="1.21.9" - -go_version() { - go version | sed -nE -e 's/[^0-9.]+([0-9.]+).+/\1/p' -} - -version_lt() { - # Return true if $1 is a lower version than than $2, - local ver1=$1 - local ver2=$2 - # Reverse sort the versions, if the 1st item != ver1 then ver1 < ver2 - if [[ $(echo -e -n "$ver1\n$ver2\n" | sort -rV | head -n1) != "$ver1" ]]; then - return 0 - else - return 1 - fi -} - -if version_lt "$(go_version)" "$go_version_minimum"; then - echo "AvalancheGo requires Go >= $go_version_minimum, Go $(go_version) found." >&2 - exit 1 -fi - # Avalanchego root folder AVALANCHE_PATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd .. && pwd ) # Load the constants diff --git a/tests/antithesis/Dockerfile.node b/tests/antithesis/Dockerfile.node index 0ccd2155c12..243e8c74c28 100644 --- a/tests/antithesis/Dockerfile.node +++ b/tests/antithesis/Dockerfile.node @@ -2,8 +2,8 @@ FROM docker.io/antithesishq/go-instrumentor AS instrumentor # Changes to the minimum golang version must also be replicated in -# scripts/build_avalanche.sh # tests/antithesis/Dockerfile.node (here) +# tests/antithesis/Dockerfile.workload # Dockerfile # README.md # go.mod diff --git a/tests/antithesis/Dockerfile.workload b/tests/antithesis/Dockerfile.workload index 0d13280a034..80b2e0d77dc 100644 --- a/tests/antithesis/Dockerfile.workload +++ b/tests/antithesis/Dockerfile.workload @@ -1,5 +1,4 @@ # Changes to the minimum golang version must also be replicated in -# scripts/build_avalanche.sh # tests/antithesis/Dockerfile.node # tests/antithesis/Dockerfile.workload (here) # Dockerfile