Skip to content

Commit 4dc39fb

Browse files
authored
Merge pull request #54 from scribd/maksimt/SERF-1700/upgrade-go-version
[SERF-1700] Upgrade go version to `1.18.5`
2 parents 52a90ce + e563a9d commit 4dc39fb

File tree

6 files changed

+5
-236
lines changed

6 files changed

+5
-236
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# build stage
33
# =============================================================================
44

5-
FROM golang:1.17.6 AS builder
5+
FROM golang:1.18.5 AS builder
66

77
ENV GO111MODULE=on
88

@@ -27,7 +27,7 @@ FROM builder AS linter
2727

2828
# binary will be $(go env GOPATH)/bin/golangci-lint
2929
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
30-
| sh -s -- -b $(go env GOPATH)/bin v1.39.0
30+
| sh -s -- -b $(go env GOPATH)/bin v1.47.3
3131

3232
# =============================================================================
3333
# development stage

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ SDK, the Go version.
5656

5757
## Prerequisites
5858

59-
* [Go](https://golang.org) (version `1.17.6`).
59+
* [Go](https://golang.org) (version `1.18.5`).
6060
* [Docker](https://www.docker.com/) (version `19.03.2`).
6161

6262
## SDK functionality
@@ -1407,7 +1407,7 @@ You can enter the docker environment to build, run and debug your service:
14071407
```
14081408
$ docker-compose run --rm sdk /bin/bash
14091409
root@1f31fa8e5c49:/sdk# go version
1410-
go version go1.17.6 linux/amd64
1410+
go version go1.18.5 linux/amd64
14111411
```
14121412

14131413
Refer to the

cmd/mage/mage.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//go:build ignore
2-
// +build ignore
32

43
package main
54

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/scribd/go-sdk
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/DATA-DOG/go-txdb v0.1.3

0 commit comments

Comments
 (0)