Skip to content

Commit

Permalink
Update minimal required Go version to 1.14
Browse files Browse the repository at this point in the history
  • Loading branch information
foxcpp committed May 31, 2020
1 parent b302a6d commit ab948e1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13-alpine3.11 AS build-env
FROM golang:1.14.3-alpine3.11 AS build-env

COPY . maddy/
WORKDIR maddy/
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ read_config() {
# Test whether the Go toolchain is available on the system and matches required
# version. If it is not present or incompatible - download Go $GOVERSION and unpack.
ensure_go() {
REQUIRED_GOVERSION=1.13.0
GOVERSION=1.13.8
REQUIRED_GOVERSION=1.14.0
GOVERSION=1.14.3

pushd "$BUILDDIR" >/dev/null

Expand Down
8 changes: 4 additions & 4 deletions docs/tutorials/manual-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

## Dependencies

- [Go](https://golang.org) toolchain (1.13 or newer)
- [Go](https://golang.org) toolchain (1.14 or newer)

If your distribution ships an outdated Go version, you can use
following commands to get a newer version:
```
go get golang.org/dl/go1.13
go1.13 download
go get golang.org/dl/go1.14
go1.14 download
```
Then use `go1.13` instead of `go` in commands below.
Then use `go1.14` instead of `go` in commands below.

- C compiler (**optional**, set CGO_ENABLED env. variable to 0 to disable)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/foxcpp/maddy

go 1.13
go 1.14

require (
blitiri.com.ar/go/spf v1.1.0
Expand Down

0 comments on commit ab948e1

Please sign in to comment.