Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Go to 1.15 #1552

Merged
merged 4 commits into from
Aug 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
install:
- SET PATH=C:\msys64\mingw64\bin;c:\gopath\bin;%PATH%
- go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.27.0
- curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b "c:\gopath\bin" v1.30.0

build: off

Expand All @@ -10,9 +10,9 @@ environment:
GOPATH: c:\gopath
NO_DOCKER: 1

stack: go 1.12
stack: go 1.15
image: Visual Studio 2019

test_script:
- SET GO111MODULE=on
- mingw32-make windows
- mingw32-make test
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ os:

language: go

go: "1.12.x"
go: "1.15.x"

go_import_path: github.com/dcos/dcos-cli

env:
- NO_DOCKER=1 GO111MODULE=on

before_install:
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.21.0
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.30.0

script:
- make
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* Accepts `DCOS_CLUSTER_SETUP_ACS_TOKEN` in `dcos auth login` (#1550)
* Read auth token without echoing it (#1551)
* Overcome Windows 254 characters limit on Windows (#1551)
* Update Go to 1.15 – support only macOS 10.12 Sierra or later (#1552)
* Require TLS 1.2 or above (#1552)

## 1.1.3

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.12
FROM golang:1.15

RUN go get -u \
golang.org/x/lint/golint \
github.com/awalterschulze/goderive \
github.com/br-lewis/go-bindata/...

RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.21.0
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.30.0
2 changes: 1 addition & 1 deletion ci/integration-tests.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pipeline {
}

stage("Build binaries") {
agent { label 'mesos-ubuntu' }
agent { label 'mesos' }

steps {
sh 'make linux darwin windows'
Expand Down
2 changes: 1 addition & 1 deletion pkg/setup/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ func (s *Setup) configureTLS(flags *Flags) (*tls.Config, error) {
return nil, err
}
}
return &tls.Config{RootCAs: certPool}, nil
return &tls.Config{RootCAs: certPool, MinVersion: tls.VersionTLS12}, nil
}

// isX509UnknownAuthorityError checks whether an error is of type x509.UnknownAuthorityError.
Expand Down