Skip to content

Fix golang.org/x/sync canonical import path#2111

Merged
fcrisciani merged 1 commit intomoby:masterfrom
thaJeztah:fix-golang-sync-canonical-import
Mar 14, 2018
Merged

Fix golang.org/x/sync canonical import path#2111
fcrisciani merged 1 commit intomoby:masterfrom
thaJeztah:fix-golang-sync-canonical-import

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Mar 14, 2018

The golang.org/x/sync package was vendored using the github.com/golang/sync URL in #2104, but this is not the canonical URL.

Because of this, vendoring failed in Moby, as it detects these to be a duplicate import:

vndr github.com/golang/sync
2018/03/14 11:54:37 Collecting initial packages
2018/03/14 11:55:00 Download dependencies
2018/03/14 11:55:00 Failed to parse config: invalid config format: // FIXME this should be golang.org/x/sync, which is already vendored above

@thaJeztah thaJeztah mentioned this pull request Mar 14, 2018
@thaJeztah
Copy link
Member Author

ping @fcrisciani @vdemeester @ddebroy PTAL

The golang.org/x/sync package was vendored using the
github.com/golang/sync URL, but this is not the canonical
URL.

Because of this, vendoring failed in Moby, as it detects
these to be a duplicate import:

    vndr github.com/golang/sync
    2018/03/14 11:54:37 Collecting initial packages
    2018/03/14 11:55:00 Download dependencies
    2018/03/14 11:55:00 Failed to parse config: invalid config format: // FIXME this should be golang.org/x/sync, which is already vendored above

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the fix-golang-sync-canonical-import branch from 974908e to 756b2d6 Compare March 14, 2018 12:11
@codecov-io
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (master@2112cac). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #2111   +/-   ##
=========================================
  Coverage          ?   40.42%           
=========================================
  Files             ?      139           
  Lines             ?    22376           
  Branches          ?        0           
=========================================
  Hits              ?     9046           
  Misses            ?    12002           
  Partials          ?     1328

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2112cac...756b2d6. Read the comment docs.

Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

Copy link
Contributor

@ctelfer ctelfer left a comment

Choose a reason for hiding this comment

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

LGTM

@fcrisciani fcrisciani merged commit 8892d75 into moby:master Mar 14, 2018
@fcrisciani
Copy link

tnx @thaJeztah

@thaJeztah thaJeztah deleted the fix-golang-sync-canonical-import branch March 14, 2018 15:25
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.

5 participants