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.

Sign up for GitHub

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

Upgrade to 1.16 #460

Merged
merged 1 commit into from
Jul 7, 2021
+104 −15,405
Merged

Upgrade to 1.16 #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: 2
jobs:
unit_test:
docker:
- image: golang:1.15
- image: golang:1.16
working_directory: /go/src/github.com/checkr/flagr
steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN make build_ui
######################################
# Prepare go_builder
######################################
FROM golang:1.15 as go_builder
FROM golang:1.16 as go_builder
WORKDIR /go/src/github.com/checkr/flagr
ADD . .
RUN make build
Expand Down
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ start:
gen: api_docs swagger

deps:
@GO111MODULE=off go get -u github.com/myitcv/gobin
@gobin github.com/go-swagger/go-swagger/cmd/[email protected]
@gobin github.com/golangci/golangci-lint/cmd/[email protected]
@go install github.com/go-swagger/go-swagger/cmd/[email protected]
@go install github.com/golangci/golangci-lint/cmd/[email protected]

serve_docs:
@npm install -g docsify-cli@4
Expand Down
15,493 changes: 97 additions & 15,396 deletions browser/flagr-ui/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/home.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ docker run -it -p 18000:18000 checkr/flagr

Install Dependencies.

- Go
- Go (1.16+)
- Make (for Makefile)
- NPM (for building UI)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/checkr/flagr

go 1.15
go 1.16

require (
cloud.google.com/go v0.37.4
Expand Down
1 change: 0 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DP
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
github.com/evalphobia/logrus_sentry v0.4.6 h1:825MLGu+SW5H8hMXGeBI7TwX7vgJLd9hz0Eth1Mnp3o=
github.com/evalphobia/logrus_sentry v0.4.6/go.mod h1:pKcp+vriitUqu9KiWj/VRFbRfFNUwz95/UkgG8a6MNc=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/getsentry/raven-go v0.0.0-20180903072508-084a9de9eb03 h1:G/9fPivTr5EiyqE9OlW65iMRUxFXMGRHgZFGo50uG8Q=
github.com/getsentry/raven-go v0.0.0-20180903072508-084a9de9eb03/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/Dockerfile-Integration-Test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
######################################
# Prepare go_builder
######################################
FROM golang:1.15 as go_builder
FROM golang:1.16 as go_builder
WORKDIR /go/src/github.com/checkr/flagr
ADD . .
RUN make build
Expand Down