Skip to content

Version bump, ignore expectations' Cargo.lock #438

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

Merged
merged 1 commit into from
Jan 25, 2017

Conversation

emilio
Copy link
Contributor

@emilio emilio commented Jan 24, 2017

@fitzgen
Copy link
Member

fitzgen commented Jan 24, 2017

@bors-servo r+

Make sure to push a tag for the version too!

@bors-servo
Copy link

📌 Commit e89bcb8 has been approved by fitzgen

@Yamakaky
Copy link
Contributor

Where can I see the available bors commands?

@KiChjang
Copy link
Member

@Yamakaky build.servo.org/homu, but you need to first have reviewer privileges before you can issue commands to bors-servo. Maybe @emilio can help you with this.

@emilio
Copy link
Contributor Author

emilio commented Jan 24, 2017

Yeah, usually you do at least a few reviews before getting reviewer privileges though

@bors-servo
Copy link

⌛ Testing commit e89bcb8 with merge 7ac7877...

bors-servo pushed a commit that referenced this pull request Jan 25, 2017
Version bump, ignore expectations' Cargo.lock

r? @fitzgen or @Yamakaky
@bors-servo
Copy link

💔 Test failed - status-travis

@heycam
Copy link
Contributor

heycam commented Jan 25, 2017

I guess the test jobs fail due to the git diff-index --quiet HEAD command. What's the purpose of that? Given that two commands previously we do a git add -A, and add changes to the index, it seems like this will always report that there is a difference between HEAD and the index and return with exit code 1.

@fitzgen
Copy link
Member

fitzgen commented Jan 25, 2017

I guess the test jobs fail due to the git diff-index --quiet HEAD command. What's the purpose of that? Given that two commands previously we do a git add -A, and add changes to the index, it seems like this will always report that there is a difference between HEAD and the index and return with exit code 1.

This is to check that regenerating the test expectations does not introduce any unexpected changes. The git add -A shouldn't result in anything getting added because there shouldn't be any changes. The diff exits non-zero if there are any changes.

As for why changes seem to be added here, I am not sure. Let me take a look.

@fitzgen
Copy link
Member

fitzgen commented Jan 25, 2017

Hmmm... because we pass --quiet there isn't much to investigate :-/

@heycam
Copy link
Contributor

heycam commented Jan 25, 2017

The git diff @ command right before it and the git diff-index HEAD should be looking at the same differences, shouldn't they?

@emilio
Copy link
Contributor Author

emilio commented Jan 25, 2017

Yup, just forgot to build after the version bump, so the cargo.lock needed to be updated.

@bors-servo r=fitzgen

@bors-servo
Copy link

📌 Commit bb63f32 has been approved by fitzgen

@bors-servo
Copy link

⌛ Testing commit bb63f32 with merge 146df32...

bors-servo pushed a commit that referenced this pull request Jan 25, 2017
Version bump, ignore expectations' Cargo.lock

r? @fitzgen or @Yamakaky
@bors-servo
Copy link

☀️ Test successful - status-travis

@bors-servo bors-servo merged commit bb63f32 into rust-lang:master Jan 25, 2017
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.

7 participants