Skip to content

Making sure the vendor and istio toml and lock stay in sync#3697

Merged
ldemailly merged 3 commits intomasterfrom
vendor_check
Feb 22, 2018
Merged

Making sure the vendor and istio toml and lock stay in sync#3697
ldemailly merged 3 commits intomasterfrom
vendor_check

Conversation

@ldemailly
Copy link
Copy Markdown
Member

@ldemailly ldemailly commented Feb 22, 2018

Fixes #3679

@ldemailly ldemailly requested a review from a team February 22, 2018 19:25
To check consistency of master first, then attempt an update
Copy link
Copy Markdown
Contributor

@costinm costinm left a comment

Choose a reason for hiding this comment

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

/lgtm

@istio-merge-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: costinm

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@mattdelco
Copy link
Copy Markdown
Contributor

I just had a hassle trying to get vendor to update. Apparently if I do a sequence like "rm -rf vendor; git checkout vendor; git fetch upstream; git rebase upstream/master; make pull" then vendor doesn't update the next time I try running the last 3 steps. If I run "git status" within vendor/ then it reports I have a detached head. I'm not sure if that's expected.

I've lost track of what checks might have been added or to-do for either presubmit or postsubmit. Anyway, something like this comes to mind as a way to only do a diff when the file have changed since the last check though I haven't checked if git lets the OS handle the timestamps of source files or instead sets them to reflect when the file was last changed in the repo.

- init: submodule check-go-version $(ISTIO_OUT)/istio_is_init
+ init: submodule $(ISTIO_OUT)/vendor_checked check-go-version $(ISTIO_OUT)/istio_is_init

$(ISTIO_OUT)/vendor_checked: Gopkg.toml Gopkg.lock | $(ISTIO_OUT)
	diff -q Gopkg.toml vendor/ || echo "vendor/ out-of-sync, run 'make pull' and/or seek on-call help" && exit 1
	diff -q Gopkg.lock vendor/ || echo "vendor/ out-of-sync, run 'make pull' and/or seek on-call help" && exit 1
	touch $(ISTIO_OUT)/vendor_checked

@ldemailly ldemailly merged commit 2cb09cd into master Feb 22, 2018
@ldemailly ldemailly deleted the vendor_check branch February 22, 2018 20:14
@ldemailly ldemailly mentioned this pull request Feb 22, 2018
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.

6 participants