Skip to content

[17.06 backport] switch CircleCI 2.0, bump go version#2844

Merged
dperny merged 9 commits intomoby:bump_v17.06from
thaJeztah:17.06_migrate_circleci_2
Apr 12, 2019
Merged

[17.06 backport] switch CircleCI 2.0, bump go version#2844
dperny merged 9 commits intomoby:bump_v17.06from
thaJeztah:17.06_migrate_circleci_2

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Apr 1, 2019 •
edited
Loading

Not yet included:

# https://github.com/docker/swarmkit/pull/2248 [ci] Bump go verison up to 1.8.3
git cherry-pick -s -S -x b5c4335827eade52ab960f037a38085bdb3fcd00

# https://github.com/docker/swarmkit/pull/2254 Run CI with temporary files on a ramdisk
git cherry-pick -s -S -x ff0a39725b9469db101e01ae0ab4d61a70d1c754

# https://github.com/docker/swarmkit/pull/2337 Use protobuild to build protobufs
# skipped --- git cherry-pick -s -S -x 135371fbd0bd8fab2d18d5122305469712a8c56b
# skipped --- git cherry-pick -s -S -x fef5dc055f8ff22d1115be57738228d20afd618e
# skipped --- git cherry-pick -s -S -x 5bb2d6a8ca33436518cefc1aa83506a5b3cf0c07
# skipped --- git cherry-pick -s -S -x 79c9bf263e7aa1b3b9e887ac86627acd02e134b3
# skipped --- git cherry-pick -s -S -x 01abb6951cb006d254cfea9010b3cb4ddeadc5e4


# https://github.com/docker/swarmkit/pull/2349 Stabilize the api proto descriptors in swarmkit
# skipped --- git cherry-pick -s -S -x be3bab1201ef85f2eff1e1d8dfb6c65d631e7b13
git cherry-pick -s -S -x 1540992284f0b570cd1b24080d8d94239f1765f2
# skipped --- git cherry-pick -s -S -x b891ae74e9fa8a7e0e1f8b4557e00bef21936a2a


# https://github.com/docker/swarmkit/pull/2395 Bump Go to 1.8.4
git cherry-pick -s -S -x 6d2c849853d5f7439b86d579a2ef2e727f6e78de

# https://github.com/docker/swarmkit/pull/2448 Update protobuf to 3.5.0
# skipped --- git cherry-pick -s -S -x 9b981e255e4b3172b54db76e3c96021f981f3e27

# https://github.com/docker/swarmkit/pull/2489 Bump Go to 1.9.3
git cherry-pick -s -S -x 2d27a21b5776827f0918d10db5f62979b7cf2a2b

# https://github.com/docker/swarmkit/pull/2636 Bump Go to 1.10.3
git cherry-pick -s -S -x 0ad63eaff3733cf1175d667c5e2ce6e8660089ba

# https://github.com/docker/swarmkit/pull/2659 Convert the circle config file to v2 format, as Circle v1 is deprecated
git cherry-pick -s -S -x 19114b466a3bf1a538e40d641f809d9d3bf74515

# https://github.com/docker/swarmkit/pull/2690 Just use the default GOPATH in CircleCI
git cherry-pick -s -S -x 7fc0c4f3a35bd7d9e8c26f6d86acf7e2718eb778

# https://github.com/docker/swarmkit/pull/2537 Fix possible data race in manager/state/store/memory_test.go
git cherry-pick -s -S -x 06add13d57411618c18d4b9d181013e932462834

# https://github.com/docker/swarmkit/pull/2752 Switch to go 1.11
# skipped --- git cherry-pick -s -S -x fd2d7f2ef925282e8cd2920efa253151749102ad

# https://github.com/docker/swarmkit/pull/2756 Dockerfile, circleci: update protoc to 3.6.1, simplify install
# skipped --- git cherry-pick -s -S -x 1831e6f05b99a5fb62ebdbdf5a02c711a8940ed8

cyli and others added 8 commits April 1, 2019 21:20
@cyli @thaJeztah
Bump go verison up to 1.8.3 for security updates, etc., and remove in…
3469a25 
…stalling the

extra mockgen package when installing dependencies.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit b5c4335)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Run CI with temporary files on a ramdisk
af5c026 
This sets up a tmpfs mount to be used for temporary files created by tests.

If this works, hopefully it will fix the excessive I/O latencies that
are blocking tests for long periods and causing them to fail.

As a side effect, this also stores temporary compilation artifacts on
tmpfs.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit ff0a397)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@tossmilestone @thaJeztah
Copy the protoc include files to as well when make ci
e05889f 
Signed-off-by: He Xiaoxi <tossmilestone@gmail.com>
(cherry picked from commit 1540992)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Bump Go to 1.8.4
6ea7c2a 
Bumps the Go version used to 1.8.4, which contains security fixes;
https://groups.google.com/forum/#!topic/golang-announce/1hZYiemnkdE

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6d2c849)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Bump Go to 1.9.3
4c00ddd 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2d27a21)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Bump Go to 1.10.3
265a270 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0ad63ea)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@cyli @thaJeztah
Convert the circle config file to v2 format, as circle v1 is deprecated
8ea7e07 
and will be removed in August 2018.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 19114b4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@cyli @thaJeztah
Set the GOPATH for the whole job
fa73f31 
Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 7fc0c4f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 1, 2019 

# github.com/docker/swarmkit/manager/state/store
manager/state/store/memory_test.go:2046: loop variable c captured by func literal
make: *** [vet] Error 1
Exited with code 2

Looks related to #2537

@thaJeztah
Fix possible data race in manager/state/store/memory_test.go
8e68ca8 
Signed-off-by: Vincent Robbemond <vincentrobbemond@gmail.com>
(cherry picked from commit 06add13)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 1, 2019

Codecov Report

Merging #2844 into bump_v17.06 will decrease coverage by 4.12%.
The diff coverage is n/a.

@@               Coverage Diff               @@
##           bump_v17.06    #2844      +/-   ##
===============================================
- Coverage        65.06%   60.94%   -4.13%     
===============================================
  Files               59      121      +62     
  Lines             8831    20218   +11387     
===============================================
+ Hits              5746    12321    +6575     
- Misses            2480     6521    +4041     
- Partials           605     1376     +771

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 1, 2019

yay, green!

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 10, 2019

ping @wk8 @dperny PTAL

@dperny dperny merged commit 73c77bc into moby:bump_v17.06 Apr 12, 2019
@thaJeztah thaJeztah deleted the 17.06_migrate_circleci_2 branch April 13, 2019 19:54
@thaJeztah thaJeztah mentioned this pull request Apr 13, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @dperny @cyli @tossmilestone