Bump SCION to v0.5.0 (#236)

* Bump scion to v0.5.0 * CI: fix handling of module version for actual tags
netsec-ethz · Mar 30, 2020 · 053fc93 · 053fc93
1 parent 3eb858e
commit 053fc93
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -39,8 +39,12 @@ jobs:
             # replacement if one is specified in the go.mod file.
             scion_mod_version=$(go list -m github.com/scionproto/scion | sed -s 's/.*\s*=>\s*//')
             scion_repo=https://${scion_mod_version% *}.git
-            # Extract the commit hash, which is the last part of the go modules version
-            scion_commit=${scion_mod_version##*-}
+            # Extract the tag or commit hash; this is the last part of the go
+            # modules version string, separated by a space from the module
+            # name; the format looks like this:
+            #   github.com/scionproto/scion v0.4.1-c0ffeeabc    # pseudo-tag followed by commit hash, or
+            #   github.com/scionproto/scion v0.5.0              # actual tag
+            scion_commit=${scion_mod_version##*[ -]}
             git clone ${scion_repo} ~/scion
             cd ~/scion
             git checkout --quiet ${scion_commit}

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/britram/borat v0.0.0-20181011130314-f891bcfcfb9b
 	github.com/d4l3k/messagediff v1.2.1 // indirect
 	github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec
-	github.com/scionproto/scion v0.4.1-0.20200324160848-64e5ff95eec1
+	github.com/scionproto/scion v0.5.0
 	github.com/spf13/cobra v0.0.4-0.20190109003409-7547e83b2d85
 	github.com/spf13/pflag v1.0.4-0.20181223182923-24fa6976df40
 	golang.org/x/crypto v0.0.0-20190909091759-094676da4a83

diff --git a/go.sum b/go.sum
@@ -116,8 +116,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE=
 github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
-github.com/scionproto/scion v0.4.1-0.20200324160848-64e5ff95eec1 h1:dEWLk21ts5TMiIpiPql0+G5j+IwyqSu/0W2sY29XoAk=
-github.com/scionproto/scion v0.4.1-0.20200324160848-64e5ff95eec1/go.mod h1:yayLUQzSt/Lwg+3dA2terZ3tEgXI9r7CX8MKrX5CIdI=
+github.com/scionproto/scion v0.5.0 h1:6IVRRpcsOlWdp8K4ojRufOHlTqfzuEzRFHAOONoJjFw=
+github.com/scionproto/scion v0.5.0/go.mod h1:yayLUQzSt/Lwg+3dA2terZ3tEgXI9r7CX8MKrX5CIdI=
 github.com/sergi/go-diff v1.0.1-0.20180205163309-da645544ed44/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=