Skip to content

Commit 99cb033

Browse files
update build tooling (#46)
1 parent 4735731 commit 99cb033

File tree

5 files changed

+40
-15
lines changed

5 files changed

+40
-15
lines changed

.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
- name: golangci-lint
1414
uses: golangci/golangci-lint-action@v2
1515
with:
16-
version: v1.32
16+
version: v1.43
1717
build:
1818
name: Build
1919
runs-on: ubuntu-latest
2020
steps:
21-
- name: Set up Go 1.15
21+
- name: Set up Go
2222
uses: actions/setup-go@v2
2323
with:
24-
go-version: 1.15
24+
go-version: 1.17
2525
id: go
2626

2727
- uses: actions/checkout@v2
@@ -33,7 +33,7 @@ jobs:
3333
run: make test
3434

3535
- name: Test coverage
36-
uses: codecov/codecov-action@v1
36+
uses: codecov/codecov-action@v2
3737

3838
- name: goreleaser
3939
uses: goreleaser/goreleaser-action@v2

.github/workflows/release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
name: goreleaser
1212
steps:
13-
- name: Set up Go 1.15
13+
- name: Set up Go
1414
uses: actions/setup-go@v2
1515
with:
16-
go-version: 1.15
16+
go-version: 1.17
1717
id: go
1818
- uses: actions/checkout@v2
1919
- name: Prepare env

.goreleaser.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ archives:
1919
format: zip
2020
dockers:
2121
- dockerfile: Dockerfile
22-
binaries:
23-
- jupyterhub-istio-proxy
24-
builds:
25-
- jupyterhub-istio-proxy
2622
image_templates:
2723
- "splunk/jupyterhub-istio-proxy:{{ .Version }}"
2824

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ check-format:
2727

2828
.PHONY: install-ci
2929
install-ci:
30-
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.32.0
30+
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.43.0

go.mod

+33-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,46 @@
11
module github.com/splunk/jupyterhub-istio-proxy
22

3-
go 1.15
3+
go 1.17
44

55
require (
66
github.com/cenkalti/backoff/v4 v4.0.2
77
github.com/gin-gonic/gin v1.7.0
88
github.com/golang/mock v1.4.4
9-
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f // indirect
10-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
11-
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
129
istio.io/api v0.0.0-20200817160544-291eb3ba8ada
1310
istio.io/client-go v0.0.0-20200817160837-c5f8590ec455
1411
k8s.io/apimachinery v0.18.8
1512
k8s.io/client-go v0.18.8
13+
)
14+
15+
require (
16+
github.com/davecgh/go-spew v1.1.1 // indirect
17+
github.com/gin-contrib/sse v0.1.0 // indirect
18+
github.com/go-playground/locales v0.13.0 // indirect
19+
github.com/go-playground/universal-translator v0.17.0 // indirect
20+
github.com/go-playground/validator/v10 v10.4.1 // indirect
21+
github.com/gogo/protobuf v1.3.1 // indirect
22+
github.com/golang/protobuf v1.3.5 // indirect
23+
github.com/google/gofuzz v1.1.0 // indirect
24+
github.com/googleapis/gnostic v0.1.0 // indirect
25+
github.com/json-iterator/go v1.1.9 // indirect
26+
github.com/leodido/go-urn v1.2.0 // indirect
27+
github.com/mattn/go-isatty v0.0.12 // indirect
28+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
29+
github.com/modern-go/reflect2 v1.0.1 // indirect
30+
github.com/ugorji/go/codec v1.1.7 // indirect
31+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
32+
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f // indirect
33+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
34+
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect
35+
golang.org/x/text v0.3.2 // indirect
36+
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
37+
google.golang.org/appengine v1.5.0 // indirect
38+
gopkg.in/inf.v0 v0.9.1 // indirect
39+
gopkg.in/yaml.v2 v2.2.8 // indirect
40+
istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a // indirect
41+
k8s.io/api v0.18.8 // indirect
42+
k8s.io/klog v1.0.0 // indirect
1643
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 // indirect
44+
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
45+
sigs.k8s.io/yaml v1.2.0 // indirect
1746
)

0 commit comments

Comments
 (0)