Check local UDMI version against upstream #274
Merged
Conversation
This file contains 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
bin/sequencer
Outdated
| @@ -40,4 +40,12 @@ echo | |||
| # Sort by test name (6th field) | |||
| fgrep 'RESULT ' $TEST_LOG | sort -k 6 | tee /tmp/sequencer.out | |||
|
|
|||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
Is this a hereto construction? I don't see ending HEAD?
There was a problem hiding this comment.
leftover from a botched merge
bin/sequencer
Outdated
| echo SUMMARY `awk '{print $5}' < /tmp/sequencer.out` | ||
| >>>>>>> master |
There was a problem hiding this comment.
leftover from a botched merge
| cd $ROOT_DIR | ||
|
|
||
| branch=master | ||
| origin=`git remote -v | fgrep faucetsdn/udmi | awk '{print $1}' | uniq` |
There was a problem hiding this comment.
TBH I'm a little surprised that we can't do tihs a little more explicitly with git remote, but, at a quick glance it seems not. No problem for now though.
johnrandolph
approved these changes
Mar 24, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.