Skip to content

Commit

Permalink
upgrade to go 1.16, and build on ARM (#104)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicks authored Mar 25, 2021
1 parent 6b78d3b commit b6f808a
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .circleci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Similar to the release image (which contains everything BUT the build
# toolchain)

FROM golang:1.14-buster
FROM golang:1.16-buster

RUN apt update && apt install -y curl ca-certificates liblz4-tool rsync socat

Expand Down
13 changes: 7 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ orbs:
jobs:
build:
docker:
- image: circleci/golang:1.14
- image: circleci/golang:1.16
working_directory: /go/src/github.com/tilt-dev/ctlptl
steps:
- checkout
- run: go get -v -t -d ./...
- run: go test -v ./...
- run: go get github.com/golangci/golangci-lint/cmd/[email protected] && make golangci-lint
- run: cd .. && go get github.com/golangci/golangci-lint/cmd/[email protected]
- run: make golangci-lint
- slack/notify-on-failure:
only_for_branches: master

Expand All @@ -35,9 +36,9 @@ jobs:
- kubernetes/install-kubectl
- run: |
set -ex
wget https://golang.org/dl/go1.15.5.linux-amd64.tar.gz
wget https://golang.org/dl/go1.16.2.linux-amd64.tar.gz
sudo rm -fR /usr/local/go
sudo tar -C /usr/local -xzf go1.15.5.linux-amd64.tar.gz
sudo tar -C /usr/local -xzf go1.16.2.linux-amd64.tar.gz
- run: |
set -ex
export MINIKUBE_VERSION=v1.15.0
Expand All @@ -59,7 +60,7 @@ jobs:

release-dry-run:
docker:
- image: circleci/golang:1.14
- image: circleci/golang:1.16
steps:
- checkout
- setup_remote_docker:
Expand All @@ -73,7 +74,7 @@ jobs:

release:
docker:
- image: circleci/golang:1.14
- image: circleci/golang:1.16
steps:
- checkout
- setup_remote_docker:
Expand Down
1 change: 1 addition & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ builds:
- darwin
goarch:
- amd64
- arm64
archives:
- name_template: "{{ .ProjectName }}.{{ .Version }}.{{ .Os }}.{{ .Arch }}"
replacements:
Expand Down
14 changes: 8 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/tilt-dev/ctlptl

go 1.14
go 1.16

require (
cloud.google.com/go v0.56.0 // indirect
Expand All @@ -11,7 +11,7 @@ require (
github.com/docker/docker v17.12.0-ce-rc1.0.20200730172259-9f28837c1d93+incompatible
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/google/go-cmp v0.5.2
github.com/google/go-cmp v0.5.4
github.com/gorilla/mux v1.8.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/imdario/mergo v0.3.11 // indirect
Expand All @@ -20,19 +20,21 @@ require (
github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/onsi/gomega v1.7.1 // indirect
github.com/onsi/ginkgo v1.14.2 // indirect
github.com/onsi/gomega v1.10.4 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
github.com/pkg/errors v0.9.1
github.com/shirou/gopsutil/v3 v3.21.2
github.com/spf13/cobra v1.1.1
github.com/sirupsen/logrus v1.8.0 // indirect
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1
github.com/stretchr/testify v1.7.0
github.com/tilt-dev/localregistry-go v0.0.0-20201021185044-ffc4c827f097
github.com/tilt-dev/wmclient v0.0.0-20201109174454-1839d0355fbc
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
golang.org/x/net v0.0.0-20210324205630-d1beb07c2056 // indirect
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
Expand Down
Loading

0 comments on commit b6f808a

Please sign in to comment.