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

feat: upgrade to Go 1.13. Closes #1375 #2097

Merged
merged 41 commits into from
Feb 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a20001d
chore: remove gogo
alexec Jan 29, 2020
636cd1f
Revert "chore: remove gogo"
alexec Jan 29, 2020
1a01e08
go13
alexec Jan 30, 2020
b4b9086
remove gogo
alexec Jan 30, 2020
4774eed
go13
alexec Jan 30, 2020
65b6525
go13
alexec Jan 30, 2020
4d7d313
sdks
alexec Jan 30, 2020
6430d11
go mod
alexec Jan 30, 2020
bf7a840
go13
alexec Jan 30, 2020
b6fb675
fix: generate swagger where you would expect
alexec Jan 30, 2020
cd3be82
vendor
alexec Jan 30, 2020
46bd5a7
gogo
alexec Jan 30, 2020
0c06592
codegen
alexec Jan 30, 2020
e9f9d14
1
alexec Jan 30, 2020
2c5f576
cron
alexec Jan 30, 2020
75ca8b7
rm autorestn
alexec Jan 30, 2020
45e902b
try again
alexec Jan 30, 2020
f619c49
reimport gogo
alexec Jan 30, 2020
990f049
reimport gogo
alexec Jan 30, 2020
a8c6cfc
Merge branch 'master' into go13
alexec Jan 30, 2020
36cb1f7
Merge branch 'master' into go13
alexec Jan 31, 2020
37af6ec
Merge branch 'master' into go13
alexec Feb 1, 2020
1ac3f2f
Merge branch 'master' into go13
alexec Feb 6, 2020
b5a9a4f
make codegen
alexec Feb 6, 2020
d477935
lint
alexec Feb 6, 2020
b041f57
Update server/info/info_server.go
alexec Feb 7, 2020
776dba7
circle
alexec Feb 7, 2020
a8dbee0
go get k8s.io/code-generator/cmd/go-to-protobuf@v0.16.7-beta.0
alexec Feb 7, 2020
f68a6f7
git diff --exit-code
alexec Feb 7, 2020
3743fbd
fix test
alexec Feb 7, 2020
a1d104e
remove vendor
alexec Feb 7, 2020
92ebb41
change
alexec Feb 7, 2020
0b171b4
try and fix codegen on ci
alexec Feb 7, 2020
c6a073d
Merge branch 'master' into go13
alexec Feb 7, 2020
4e681e1
removed unused files
alexec Feb 7, 2020
6caf5c5
remove codegen for go13
alexec Feb 7, 2020
50d5c54
Merge branch 'master' into go13
alexec Feb 7, 2020
93a08a9
make codegen
alexec Feb 7, 2020
7ebf1bb
Merge branch 'master' into go13
alexec Feb 7, 2020
e967e9a
go mode cache
alexec Feb 7, 2020
527afa1
Merge branch 'master' into go13
alexec Feb 11, 2020
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
43 changes: 17 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,37 @@ commands:
- run:
name: Install Kustomize
command: cd /usr/local/bin && curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | sudo bash
dep_ensure:
alexec marked this conversation as resolved.
Show resolved Hide resolved
restore_go_mod:
steps:
- run:
name: Install Dep v0.5.3
command: DEP_RELEASE_TAG=v0.5.3 curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
- restore_cache:
name: Restore vendor cache
name: Restore go mod cache
keys:
- vendor-v6-{{ checksum "Gopkg.lock" }}-{{ .Environment.CIRCLE_JOB }}
- run:
name: Ensure dependencies
command: |
# dep ensure takes 5m, but is only needed if not cached
[[ -e vendor ]] || make vendor && touch vendor
- go-mod-v1-{{ checksum "go.sum" }}-{{ .Environment.CIRCLE_JOB }}
save_go_mod:
steps:
- save_cache:
name: Save vendor cache
key: vendor-v6-{{ checksum "Gopkg.lock" }}-{{ .Environment.CIRCLE_JOB }}
name: Save go mod cache
key: go-mod-v1-{{ checksum "go.sum" }}-{{ .Environment.CIRCLE_JOB }}
paths:
- vendor
- /home/circleci/.go_workspace/go/pkg/mod
when: always
install_golang:
steps:
- run:
name: Install Golang v1.12.6
name: Install Golang v1.13.4
command: |
go get golang.org/dl/go1.12.6
[ -e /home/circleci/sdk/go1.12.6 ] || go1.12.6 download
go get golang.org/dl/go1.13.4
[ -e /home/circleci/sdk/go1.13.4 ] || go1.13.4 download
echo "export GOPATH=/home/circleci/.go_workspace" | tee -a $BASH_ENV
echo "export PATH=/home/circleci/sdk/go1.12.6/bin:\$PATH" | tee -a $BASH_ENV
echo "export PATH=/home/circleci/sdk/go1.13.4/bin:\$PATH" | tee -a $BASH_ENV
save_go_cache:
steps:
- save_cache:
name: Save Golang cache
key: go-v5-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
paths:
- /home/circleci/.cache/go-build
- /home/circleci/sdk/go1.12.6
- /home/circleci/sdk/go1.13.4
when: always
restore_go_cache:
steps:
Expand All @@ -50,8 +44,6 @@ commands:
keys:
- go-v5-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
- go-v5-master-{{ .Environment.CIRCLE_JOB }}
- go-v4-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
- go-v4-master-{{ .Environment.CIRCLE_JOB }}
e2e:
steps:
- install_kustomize
Expand All @@ -63,7 +55,7 @@ commands:
- install_golang
- go_junit_report
- checkout
- dep_ensure
- restore_go_mod
- run:
name: Create KUBECONFIG
# Copy kubeconfig file, and add a fake user for "argo --token xxx" testing
Expand Down Expand Up @@ -108,6 +100,7 @@ commands:
mkdir -p test-results
trap 'go-junit-report < test-results/test.out > test-results/junit.xml' EXIT
make test-e2e 2>&1 | tee test-results/test.out
- save_go_mod
- save_go_cache
- store_test_results:
path: test-results
Expand All @@ -130,17 +123,15 @@ jobs:
- install_golang
- go_junit_report
- checkout
- dep_ensure
- restore_go_mod
- run:
name: Run tests
command: |
mkdir -p test-results
trap 'go-junit-report < test-results/test.out > test-results/junit.xml' EXIT
make test 2>&1 | tee test-results/test.out
- run:
name: Verify code generation
command: make verify-codegen verify-manifests
- save_go_cache
- save_go_mod
- run:
name: Uploading code coverage
command: bash <(curl -s https://codecov.io/bash) -f coverage.out
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ cmd/**/debug
hack/**/debug
/argo
/argoexec
/sdks
debug.test
*.iml
/coverage.out
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
# Also used as the image in CI jobs so needs all dependencies
####################################################################################################
FROM golang:1.11.5 as builder
FROM golang:1.13.4 as builder

RUN apt-get update && apt-get install -y \
git \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
# Also used as the image in CI jobs so needs all dependencies
####################################################################################################
FROM golang:1.11.5 as builder
FROM golang:1.13.4 as builder

RUN apt-get update && apt-get install -y \
git \
Expand Down
Loading