Skip to content

[18.03] migrate to CircleCI 2.0#2696

Merged
dperny merged 4 commits intomoby:bump_v18.03from
thaJeztah:18.03-circle-2.0
Jul 9, 2018
Merged

[18.03] migrate to CircleCI 2.0#2696
dperny merged 4 commits intomoby:bump_v18.03from
thaJeztah:18.03-circle-2.0

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jul 7, 2018

This migrates the 18.03 branch to use CircleCI 2.0, making sure that CI can still run after August. Backports:

git checkout -b 18.03-circle-2.0 upstream/bump_v18.03 
git cherry-pick -s -S -x 0ad63eaff3733cf1175d667c5e2ce6e8660089ba
git cherry-pick -s -S -x 19114b466a3bf1a538e40d641f809d9d3bf74515
git cherry-pick -s -S -x 7fc0c4f3a35bd7d9e8c26f6d86acf7e2718eb778

cherry-picks were clean

@thaJeztah
Copy link
Copy Markdown
Member Author

ping @cyli @anshulpundir @dperny PTAL

@thaJeztah
Copy link
Copy Markdown
Member Author

Hm, interesting; possibly a change we don't have yet, and causing failure on Go 1.10?

# 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

@thaJeztah
Copy link
Copy Markdown
Member Author

Found it; #2536 - fixed by #2537 - adding it to the list

Vincent Robbemond and others added 4 commits July 8, 2018 01:38
Signed-off-by: Vincent Robbemond <vincentrobbemond@gmail.com>
(cherry picked from commit 06add13)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0ad63ea)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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>
Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 7fc0c4f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 7, 2018

Codecov Report

Merging #2696 into bump_v18.03 will decrease coverage by 0.3%.
The diff coverage is n/a.

@@               Coverage Diff               @@
##           bump_v18.03    #2696      +/-   ##
===============================================
- Coverage         61.6%   61.29%   -0.31%     
===============================================
  Files              134      134              
  Lines            21795    21795              
===============================================
- Hits             13426    13359      -67     
- Misses            6929     6997      +68     
+ Partials          1440     1439       -1

@thaJeztah
Copy link
Copy Markdown
Member Author

👍 perfect; it's green now 🎉

Copy link
Copy Markdown
Contributor

@cyli cyli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for backporting this @thaJeztah! LGTM

@dperny
Copy link
Copy Markdown
Collaborator

dperny commented Jul 9, 2018

Very important, CI would have broken on this branch.

@dperny dperny merged commit e5dc323 into moby:bump_v18.03 Jul 9, 2018
@thaJeztah thaJeztah deleted the 18.03-circle-2.0 branch July 9, 2018 22:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants