Skip to content

/ servo

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

change branch of spirv_cross #25592

Merged
merged 1 commit into from Jan 24, 2020
Merged

change branch of spirv_cross #25592

merged 1 commit into from Jan 24, 2020

Conversation

@pshaughn
Copy link
Member

pshaughn commented Jan 23, 2020

Hopefully fixes #25991
@pshaughn
Copy link
Member Author

pshaughn commented Jan 23, 2020

It does not yet do so... @kvark could you please put the commit were were locked at on the tree?
@kvark
Copy link
Member

kvark commented Jan 24, 2020

bors try
@kvark
Copy link
Member

kvark commented Jan 24, 2020

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Jan 24, 2020

⌛ Trying commit 4cae9bc with merge c689b5f...
bors-servo added a commit that referenced this pull request Jan 24, 2020
@bors-servo
Auto merge of #25592 - pshaughn:spirvcross_rebase, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c689b5f 
change branch of spirv_cross

Hopefully fixes #25991
@bors-servo
Copy link
Contributor

bors-servo commented Jan 24, 2020

💔 Test failed - status-taskcluster
@jdm
Copy link
Member

jdm commented Jan 24, 2020

@bors-servo retry p=10
@bors-servo
Copy link
Contributor

bors-servo commented Jan 24, 2020

⌛ Trying commit 4cae9bc with merge 427a09b...
bors-servo added a commit that referenced this pull request Jan 24, 2020
@bors-servo
Auto merge of #25592 - pshaughn:spirvcross_rebase, r=<try>
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
427a09b 
change branch of spirv_cross

Hopefully fixes #25991
@bors-servo
Copy link
Contributor

bors-servo commented Jan 24, 2020

💔 Test failed - status-taskcluster
@SimonSapin
SimonSapin reviewed Jan 24, 2020
View changes
Cargo.toml Outdated
@@ -30,5 +30,5 @@ opt-level = 3
mio = { git = "https://github.com/servo/mio.git", branch = "servo" }
# https://github.com/retep998/winapi-rs/pull/816
winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" }
spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu" }
spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu-servo" }

This comment has been minimized.

Sign in to view
@SimonSapin

SimonSapin Jan 24, 2020

Member

Please also change the URL to https://github.com/servo/spirv_cross, which I’ve just forked from kvark/spirv_cross.
@Manishearth
Manishearth approved these changes Jan 24, 2020
View changes
Copy link
Member

Manishearth left a comment

r+ with simon's change
@pshaughn
change branch of spirv_cross
Loading status checks…
1979e67
@pshaughn pshaughn force-pushed the pshaughn:spirvcross_rebase branch from 4cae9bc to 1979e67 Jan 24, 2020
@pshaughn
Copy link
Member Author

pshaughn commented Jan 24, 2020

@bors-servo retry
@jdm
Copy link
Member

jdm commented Jan 24, 2020

@bors-servo r=Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Jan 24, 2020

📌 Commit 1979e67 has been approved by Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Jan 24, 2020

⌛ Testing commit 1979e67 with merge 60238af...
bors-servo added a commit that referenced this pull request Jan 24, 2020
@bors-servo
Auto merge of #25592 - pshaughn:spirvcross_rebase, r=Manishearth
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
60238af 
change branch of spirv_cross

Hopefully fixes #25991
@bors-servo
Copy link
Contributor

bors-servo commented Jan 24, 2020

☀️ Test successful - status-taskcluster
Approved by: Manishearth
Pushing 60238af to master...
1 similar comment
@bors-servo
Copy link
Contributor

bors-servo commented Jan 24, 2020

☀️ Test successful - status-taskcluster
Approved by: Manishearth
Pushing 60238af to master...
@bors-servo bors-servo merged commit 1979e67 into servo:master Jan 24, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
@pshaughn pshaughn mentioned this pull request Jan 25, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SimonSapin SimonSapin

@Manishearth Manishearth

Assignees

@Manishearth Manishearth

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@pshaughn @kvark @bors-servo @jdm @SimonSapin @Manishearth @highfive
You can’t perform that action at this time.