Skip to content

Commit

Permalink
[#3579] Update go 1.17 and golang.org/x/sys lib
Browse files Browse the repository at this point in the history
Updates Go to 1.17 as golang.org/x/sys only allows 2 versions behind the latest one. Go 1.19 was released last month.
  • Loading branch information
Twsouza committed Sep 15, 2022
1 parent 62295e6 commit d9d46fd
Show file tree
Hide file tree
Showing 152 changed files with 6,560 additions and 2,956 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
type: string
default: ""
docker:
- image: circleci/golang:1.16
- image: circleci/golang:1.17
environment:
PROVIDER: <<parameters.provider>>
ARGS: <<parameters.args>>
Expand All @@ -130,14 +130,14 @@ jobs:
when: always
cleanup:
docker:
- image: circleci/golang:1.16
- image: circleci/golang:1.17
steps:
- checkout
- ci-dependencies
- run: scripts/ci-cleanup
cleanup_all:
docker:
- image: circleci/golang:1.16
- image: circleci/golang:1.17
steps:
- checkout
- ci-dependencies
Expand All @@ -151,14 +151,14 @@ jobs:
repo:
type: string
docker:
- image: circleci/golang:1.16
- image: circleci/golang:1.17
steps:
- checkout
- ci-dependencies
- run: ci/deploy.sh <<parameters.repo>> <<parameters.app>> <<parameters.check>>
test:
docker:
- image: circleci/golang:1.16
- image: circleci/golang:1.17
working_directory: /go/src/github.com/convox/rack
steps:
- checkout
Expand All @@ -170,7 +170,7 @@ jobs:
- run: curl -s https://codecov.io/bash | bash
update:
docker:
- image: circleci/golang:1.16
- image: circleci/golang:1.17
steps:
- checkout
- ci-dependencies
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## test ########################################################################

FROM golang:1.16 AS test
FROM golang:1.17 AS test

ARG DOCKER_ARCH=x86_64
ARG KUBECTL_ARCH=amd64
Expand Down Expand Up @@ -48,7 +48,7 @@ CMD ["bin/web"]

## package #####################################################################

FROM golang:1.16 AS package
FROM golang:1.17 AS package

RUN apt-get update && apt-get -y install upx-ucl

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.arm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## package #####################################################################

FROM golang:1.16 AS package
FROM golang:1.17 AS package

RUN apt-get update && apt-get -y install upx-ucl

Expand Down
2 changes: 1 addition & 1 deletion cmd/build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16
FROM golang:1.17

RUN curl -s https://download.docker.com/linux/static/stable/x86_64/docker-18.03.1-ce.tgz | \
tar -C /usr/bin --strip-components 1 -xz
Expand Down
4 changes: 2 additions & 2 deletions cmd/convox/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: all build package release

pkg_darwin = pkg/convox-darwin-10.16-amd64
pkg_darwin = pkg/convox-darwin-amd64
pkg_darwin_arm64 = pkg/convox-darwin-arm64
pkg_linux = pkg/convox-linux-amd64
pkg_linux_arm64 = pkg/convox-linux-arm64
Expand All @@ -20,7 +20,7 @@ package:

go install github.com/crazy-max/xgo@v0.7.5
if [ -f /.dockerenv ]; then tar cz $(GOPATH) | docker run -v $(GOPATH):/gopath -i ubuntu tar xz -C /gopath --strip-components 2; fi
cd ../.. && $(GOPATH)/bin/xgo -branch $(shell git rev-parse HEAD) -pkg cmd/convox -out cmd/convox/pkg/convox -go 1.16.x -targets 'darwin/amd64' -ldflags "-X main.version=$(VERSION)" .
cd ../.. && $(GOPATH)/bin/xgo -branch $(shell git rev-parse HEAD) -pkg cmd/convox -out cmd/convox/pkg/convox -go 1.17.x -targets 'darwin/amd64' -ldflags "-X main.version=$(VERSION)" .
if [ -f /.dockerenv ]; then mkdir -p pkg && docker run -v $(GOPATH):/gopath -i ubuntu tar czv /gopath/src/github.com/convox/rack/cmd/convox/pkg | tar xzv -C pkg --strip-components 8; fi

release: package
Expand Down
29 changes: 27 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/convox/rack

go 1.16
go 1.17

require (
github.com/PuerkitoBio/goquery v1.1.0
Expand Down Expand Up @@ -53,25 +53,50 @@ require (
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/convox/go-u2fhost v0.0.0-20220210143516-c133f566e496
github.com/convox/inotify v0.0.0-20170313035821-b56f5149b5c6 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 // indirect
github.com/elazarl/goproxy v0.0.0-20210801061803-8e322dfb79c4 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/gobuffalo/envy v1.6.12 // indirect
github.com/gobuffalo/packd v0.0.0-20181212173646-eca3b8fd6687 // indirect
github.com/gobuffalo/syncx v0.0.0-20181120194010-558ac7de985f // indirect
github.com/gogo/protobuf v1.2.1 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
github.com/golang/protobuf v1.3.1 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gorilla/context v1.1.1 // indirect
github.com/gorilla/securecookie v1.1.1 // indirect
github.com/gorilla/sessions v1.1.3 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 // indirect
github.com/headzoo/ut v0.0.0-20181013193318-a13b5a7a02ca // indirect
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
github.com/joho/godotenv v1.3.0 // indirect
github.com/json-iterator/go v1.1.5 // indirect
github.com/mattn/go-colorable v0.0.9 // indirect
github.com/mattn/go-isatty v0.0.4 // indirect
github.com/mattn/go-runewidth v0.0.4 // indirect
github.com/moby/moby v1.13.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
github.com/opencontainers/runc v0.1.1 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.1.0 // indirect
github.com/sebest/xff v0.0.0-20160910043805-6c115e0ffa35 // indirect
github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c // indirect
github.com/spf13/pflag v1.0.3 // indirect
github.com/stretchr/objx v0.1.1 // indirect
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/sys v0.0.0-20220913153101-76c7481b5158 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c // indirect
)
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220913153101-76c7481b5158 h1:XQphkCZeKYaMRSo28HqvvNYuLOoM5CIOOvTZfthvTgI=
golang.org/x/sys v0.0.0-20220913153101-76c7481b5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
Expand Down
3 changes: 0 additions & 3 deletions vendor/github.com/bearsh/hid/go.mod

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/github.com/convox/go-u2fhost/go.mod

This file was deleted.

Loading

0 comments on commit d9d46fd

Please sign in to comment.