-
Notifications
You must be signed in to change notification settings - Fork 44
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
Changes from 16 commits
805f06a
998d107
1b9ed53
241cfbb
f84e96c
6e8b767
6cfeecc
884a730
6a22410
e4ab4ac
a79d334
a3e1acf
dbef021
a0d26c0
cccfc1e
f44203c
a77401a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this a hereto construction? I don't see ending HEAD? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. leftover from a botched merge |
||
echo Running tools version `(cd $ROOT_DIR; git describe)` | ||
|
||
echo SUMMARY `fgrep 'RESULT ' $TEST_LOG | awk '{print $3, $2}' | sort | awk '{print $2}'` | ||
|
||
bin/check_version | ||
======= | ||
echo SUMMARY `awk '{print $5}' < /tmp/sequencer.out` | ||
>>>>>>> master | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similar confusion? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. leftover from a botched merge |
This file was deleted.
This file was deleted.
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.