Skip to content

Commit

Permalink
yet again fixing VERSION
Browse files Browse the repository at this point in the history
  • Loading branch information
@cvvergara
cvvergara committed Oct 11, 2017
1 parent 139c2f5 commit 62048a6
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 21 deletions.
16 changes: 11 additions & 5 deletions tools/release-scripts/check-release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,18 +258,24 @@ echo "- VERSION"

#---------------------------------------------------------------------

if [[ -z $DEBUG ]]; then
if [[ -n $DEBUG ]]; then
echo "\`\`\`"
echo "cat VERSION | grep \"release/$MAYOR.$MINOR\""
echo "\`\`\`"
fi

if [[ $(cat VERSION | grep "release/$MAYOR.$MINOR") != *"release/$MAYOR.$MINOR" ]]; then
error_msg "VERSION should have release/$MAYOR.$MINOR"
exit 1
if [[ "$BRANCH" != "master" ]]; then
if [[ $(cat VERSION | grep "release/$MAYOR.$MINOR") != *"release/$MAYOR.$MINOR" ]]; then
error_msg "VERSION should have release/$MAYOR.$MINOR"
exit 1
fi
else
echo " -[x] VERSION file branch: OK"
if [[ $(cat VERSION | grep "$BRANCH") != *"master" ]]; then
error_msg "VERSION should have master"
exit 1
fi
fi
echo " -[x] VERSION file branch: OK"

#---------------------------------------------------------------------
echo
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.0.0--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.0.1--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.1.0--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.2.0--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.2.1--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.2.2--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.2.3--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.2.4--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.3.0--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.3.1--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.3.2--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.4.0--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.4.1--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.4.2--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.5.0--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down
2 changes: 1 addition & 1 deletion tools/sql-update-scripts/pgrouting--2.5.1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ RETURNS TABLE(
$BODY$
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'8f04a57bf'::varchar AS hash,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
Expand Down

0 comments on commit 62048a6

Please sign in to comment.