spirv-llvm-translator: fix duplicate makeFlags merge#171784
Closed
calbrecht wants to merge 1 commit intoNixOS:stagingfrom
Closed
spirv-llvm-translator: fix duplicate makeFlags merge#171784calbrecht wants to merge 1 commit intoNixOS:stagingfrom
calbrecht wants to merge 1 commit intoNixOS:stagingfrom
Conversation
See NixOS#171656 (comment) there was a conflict with NixOS#162603 and a GitHub Action did a bad merge in 4cab9ae#diff-1aeab0da45b3afb6688d321042021a2ebad96758fc495d92aaadb50cc9aa22c7R28, adding a second makeFlags and breaking the build.
Member
Author
|
Hm, i figured this should probably go into staging-next |
Member
|
ofborg evals the base branch first so we can probably ignore those CI failures (example is #170193). Edit: Merged as 5ee3e9f |
bobby285271
added a commit
that referenced
this pull request
May 6, 2022
Fixes the eval on staging branch.
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See
#171656 (comment)
there was a conflict with #162603 and a GitHub Action did a bad merge in 4cab9ae#diff-1aeab0da45b3afb6688d321042021a2ebad96758fc495d92aaadb50cc9aa22c7R28, adding a second makeFlags and breaking the build.