From 5e36cb102502b191e4a7d6f8342f31ea2c6b6f2e Mon Sep 17 00:00:00 2001 From: NotZippy Date: Fri, 12 Oct 2018 20:50:42 -0700 Subject: [PATCH] Updated travis to use checkout matching branch of Revel Framework for build. --- .travis.yml | 2 ++ model/version.go | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 057cc9e..e42f9ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,8 @@ install: - export REVEL_BRANCH="develop" - 'if [[ "$TRAVIS_BRANCH" == "master" ]]; then export REVEL_BRANCH="master"; fi' - 'echo "Travis branch: $TRAVIS_BRANCH, Revel dependency branch: $REVEL_BRANCH"' + - git clone -b $REVEL_BRANCH git://github.com/revel/revel ../revel/ + - git clone -b $REVEL_BRANCH git://github.com/revel/modules ../modules/ - go get -t -v github.com/revel/cmd/revel - go get -u github.com/golang/dep/cmd/dep - echo $GOPATH diff --git a/model/version.go b/model/version.go index 2b6a847..502cbb4 100644 --- a/model/version.go +++ b/model/version.go @@ -16,7 +16,7 @@ type Version struct { } // The compatibility list -var frameworkCompatibleList = [][]string{ +var frameworkCompatibleRangeList = [][]string{ {"0.0.0", "0.20.0"}, // minimum Revel version to use with this version of the tool {"0.19.99", "0.30.0"}, // Compatible with Framework V 0.19.99 - 0.30.0 } @@ -56,7 +56,7 @@ func (v *Version) intOrZero(input string) (value int) { // Returns true if this major revision is compatible func (v *Version) CompatibleFramework(c *CommandConfig) error { - for i, rv := range frameworkCompatibleList { + for i, rv := range frameworkCompatibleRangeList { start, _ := ParseVersion(rv[0]) end, _ := ParseVersion(rv[1]) if !v.Newer(start) || v.Newer(end) { @@ -68,7 +68,7 @@ func (v *Version) CompatibleFramework(c *CommandConfig) error { } return nil } - return errors.New("Unknown versions - do a 'go get -u github.com/revel/cmd/revel github.com/revel/modules github.com/revel/revel'") + return errors.New("Tool out of date - do a 'go get -u github.com/revel/cmd/revel'") } // Returns true if this major revision is newer then the passed in