-
Notifications
You must be signed in to change notification settings - Fork 46
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
Check local UDMI version against upstream #274
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
805f06a
Adding check script
grafnu 998d107
Adding script usage
grafnu 1b9ed53
Merge branch 'master' into vcheck
grafnu 241cfbb
Merge branch 'master' into vcheck
grafnu f84e96c
Fix testing header typo
grafnu 6e8b767
Merge branch 'testfixes' into vcheck
grafnu 6cfeecc
Diagnostics
grafnu 884a730
Fix repo detect
grafnu 6a22410
Also fetch tags
grafnu e4ab4ac
More diagnostics
grafnu a79d334
Don't die on unknown local version
grafnu a3e1acf
Add diagnostics
grafnu dbef021
Add faucetsdn default
grafnu a0d26c0
Merge branch 'master' into vcheck
grafnu cccfc1e
Silent script
grafnu f44203c
Merge branch 'master' into vcheck
grafnu a77401a
Cleanup botched merge
grafnu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
#!/bin/bash -e | ||
# | ||
# This script intentionally runs silent if there is no version mismatch found. | ||
# | ||
|
||
ROOT_DIR=$(dirname $0)/.. | ||
cd $ROOT_DIR | ||
|
||
branch=master | ||
origin=`git remote -v | fgrep faucetsdn/udmi | awk '{print $1}' | uniq` | ||
|
||
if [[ -z $origin ]]; then | ||
echo No git origin found, adding faucetsdn... | ||
git remote add faucetsdn https://github.com/faucetsdn/udmi.git | ||
origin=faucetsdn | ||
fi | ||
|
||
git fetch $origin --tags 2>/dev/null | ||
upstream_ver=`git describe $origin/$branch --abbrev=0` | ||
current_ver=`git describe HEAD --abbrev=0 || echo unknown` | ||
|
||
if [[ $current_ver != $upstream_ver ]]; then | ||
echo | ||
echo Local UDMI version $current_ver does not match upstream version $upstream_ver | ||
echo Please consider updating as needed. | ||
echo | ||
fi |
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
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
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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.