Skip to content

Commit 780a3b3

Browse files
committed
Fixing linter for apple silicon:
golangci/golangci-lint#1725
1 parent 904cd76 commit 780a3b3

File tree

8 files changed

+10
-13
lines changed

8 files changed

+10
-13
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ language: shell
55
env:
66
global:
77
# GO VERSION is set here with GIMME_GO_VERSION see: https://github.com/travis-ci/gimme
8-
# may also want to run `go mod edit -go=1.13` to fix go.mod as well
9-
- GIMME_GO_VERSION=1.13.x GIMME_OS=linux GIMME_ARCH=amd64
8+
# may also want to run `go mod edit -go=1.16` to fix go.mod as well
9+
- GIMME_GO_VERSION=1.16.x GIMME_OS=linux GIMME_ARCH=amd64
1010

1111
branches:
1212
only:

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ build: $(TARGET) check-go ## builds and installs binary in bin/
3636

3737
check-go:
3838
ifndef GOPATH
39-
$(error "go is not available please install golang version 1.13+, https://golang.org/dl/")
39+
$(error "go is not available please install golang version 1.16+, https://golang.org/dl/")
4040
endif
4141

4242
clean: check-go ## runs `go clean` and removes the bin/ dir
@@ -51,7 +51,8 @@ cover-html: cover ## generates test coverage html report
5151

5252
setup: check-go ## installs all dev and ci dependencies, but does not install golang
5353
ifeq (,$(wildcard $(GOLINT)))
54-
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOPATH)/bin v1.19.0
54+
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOPATH)/bin v1.50.1
55+
5556
endif
5657
ifeq (,$(wildcard $(GOPATH)/bin/statik))
5758
go get github.com/rakyll/statik

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Optimizely Full Stack is A/B testing and feature flag management for product dev
1010
To get started with Optimizely Agent, follow the [Quickstart guide](https://docs.developers.optimizely.com/full-stack/docs/) and view example usage in our [examples folder](./examples).
1111

1212
## Prerequisites
13-
Optimizely Agent is implemented in [Golang](https://golang.org/). Golang version 1.13+ is required for developing and compiling from source.
13+
Optimizely Agent is implemented in [Golang](https://golang.org/). Golang version 1.16+ is required for developing and compiling from source.
1414
Installers and binary archives for most platforms can be downloaded directly from the Go [downloads](https://golang.org/dl/) page.
1515

1616
## Running from source (Linux / OSX)

docs/readme-sync/v3.1/deploy-as-a-microservice/020 - setup-optimizely-agent.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ updatedAt: "2020-03-31T23:54:17.841Z"
1212

1313
To develop and compile Optimizely Agent from source:
1414

15-
1. Install [Golang](https://golang.org/dl/) version 1.13+ .
15+
1. Install [Golang](https://golang.org/dl/) version 1.16+ .
1616
2. Clone the [Optimizely Agent repo](https://github.com/optimizely/agent).
1717
3. From the repo directory, open a terminal and start Optimizely Agent:
1818

docs/readme-sync/v4.0/deploy-as-a-microservice/020 - setup-optimizely-agent.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ updatedAt: "2021-03-15T23:02:34.056Z"
1212

1313
To develop and compile Optimizely Agent from source:
1414

15-
1. Install [Golang](https://golang.org/dl/) version 1.13+ .
15+
1. Install [Golang](https://golang.org/dl/) version 1.16+ .
1616
2. Clone the [Optimizely Agent repo](https://github.com/optimizely/agent).
1717
3. From the repo directory, open a terminal and start Optimizely Agent:
1818

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/optimizely/agent
22

3-
go 1.13
3+
go 1.16
44

55
require (
66
github.com/VividCortex/gohistogram v1.0.0 // indirect

go.sum

-4
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,13 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
6363
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
6464
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
6565
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
66-
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
6766
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
6867
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
6968
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
7069
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
7170
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
7271
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
7372
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
74-
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
7573
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
7674
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
7775
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
@@ -243,7 +241,6 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
243241
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
244242
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
245243
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
246-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
247244
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
248245
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
249246
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -256,7 +253,6 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE
256253
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
257254
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
258255
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
259-
google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
260256
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
261257
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
262258
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

scripts/build.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ function main($mode) {
101101
# noninteractive mode: ./build.ps1 noninteractive (default: interactive)
102102

103103
# check if go is installed, if not, install it.
104-
checkPrereq 'Go Programming Language amd64 go1.13.5' https://dl.google.com/go/go1.13.5.windows-amd64.msi eabcf66d6d8f44de21a96a18d957990c62f21d7fadcb308a25c6b58c79ac2b96 $mode
104+
checkPrereq 'Go Programming Language amd64 go1.16' https://dl.google.com/go/go1.16.windows-amd64.msi 0fd550a74f6c8ef5df405751f5e39a0ba25786930c5d61503bf71d3c3efa2414 $mode
105105
# same but with git
106106
checkPrereq 'Git version 2.24.1.2' https://github.com/git-for-windows/git/releases/download/v2.24.1.windows.2/Git-2.24.1.2-64-bit.exe 34e484936105713e7d0c2f421bf62e4cfe652f6638a9ecb5df2186c1918753e2 $mode
107107

0 commit comments

Comments
 (0)