Skip to content

Commit

Permalink
Update golang version to 1.20.10
Browse files Browse the repository at this point in the history
This feature release mitigates CVE-2023-39325
  • Loading branch information
SEJeff committed Oct 24, 2023
1 parent e3471a9 commit c6afdee
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "1.20.8"
go-version: "1.20.10"
- run: make node

algorand:
Expand Down Expand Up @@ -276,7 +276,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "1.20.8"
go-version: "1.20.10"
- run: cd sdk/vaa && go test && go test -v -fuzz FuzzCalculateQuorum -run FuzzCalculateQuorum -fuzztime 15s

# Run Go linters
Expand All @@ -293,7 +293,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "1.20.8"
go-version: "1.20.10"
- name: Install formatter
run: go install golang.org/x/tools/cmd/goimports@v0.8.0
- name: Formatting checks
Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "1.20.8"
go-version: "1.20.10"
# The go-ethereum and celo-blockchain packages both implement secp256k1 using the exact same header, but that causes duplicate symbols.
- name: Run golang tests
run: cd node && go test -v -timeout 5m -race -ldflags '-extldflags "-Wl,--allow-multiple-definition" ' ./...
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
FROM docker.io/golang:1.20.8-bullseye@sha256:2db41d88870617e0f43e7e1f304649eb4563706e3c4d25a624e43e83299fb822 AS go-tools
FROM docker.io/golang:1.20.10-bullseye@sha256:082569b3303b164cc4a7c88ac59b19b69c1a5d662041ac0dca046ac239632442 AS go-tools

# Support additional root CAs
COPY README.md cert.pem* /certs/
Expand All @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/root/.cache --mount=type=cache,target=/go \
cd /app/tools && CGO_ENABLED=0 ./build.sh

# syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
FROM docker.io/golang:1.20.8-bullseye@sha256:2db41d88870617e0f43e7e1f304649eb4563706e3c4d25a624e43e83299fb822 AS go-build
FROM docker.io/golang:1.20.10-bullseye@sha256:082569b3303b164cc4a7c88ac59b19b69c1a5d662041ac0dca046ac239632442 AS go-build

# Support additional root CAs
COPY README.md cert.pem* /certs/
Expand Down
2 changes: 1 addition & 1 deletion node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
FROM --platform=linux/amd64 docker.io/golang:1.20.8-bullseye@sha256:2db41d88870617e0f43e7e1f304649eb4563706e3c4d25a624e43e83299fb822 AS build
FROM --platform=linux/amd64 docker.io/golang:1.20.10-bullseye@sha256:082569b3303b164cc4a7c88ac59b19b69c1a5d662041ac0dca046ac239632442 AS build
# libwasmvm.so is not compatible with arm

# Support additional root CAs
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile.lint
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker.io/docker/dockerfile:1.3@sha256:42399d4635eddd7a9b8a24be879d2f9a930d0ed040a61324cfdf59ef1357b3b2
FROM docker.io/golang:1.20.8-bullseye@sha256:2db41d88870617e0f43e7e1f304649eb4563706e3c4d25a624e43e83299fb822
FROM docker.io/golang:1.20.10-bullseye@sha256:082569b3303b164cc4a7c88ac59b19b69c1a5d662041ac0dca046ac239632442

RUN useradd -u 1000 -U -m -d /home/lint lint
USER 1000
Expand Down
4 changes: 2 additions & 2 deletions scripts/dev-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ esac

# Install dependencies
case "$DISTRO" in
Debian-*|Ubuntu-*) sudo apt-get -y install bash-completion git git-review vim ;;
Debian-*|Ubuntu-*) sudo apt-get -y install bash-completion git git-review vim ;;
RedHatEnterprise-8.*) sudo dnf -y install curl bash-completion git git-review vim ;;
*) echo "Internal error: $DISTRO not matched in case block." && exit 1 ;;
esac

# Install Go
ARCH=amd64
GO=1.20.8
GO=1.20.10

(
if [[ -d /usr/local/go ]]; then
Expand Down

0 comments on commit c6afdee

Please sign in to comment.