Skip to content

Commit

Permalink
groot: bump to ROOT-6.22/00
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbinet
sbinet committed Aug 3, 2020
1 parent 1a9e6f7 commit 4b4fa01
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Expand Up @@ -10,7 +10,7 @@ on:

env:
GOPROXY: "https://proxy.golang.org"
ROOT_VERSION: "6.20.00"
ROOT_VERSION: "6.22.00"
TAGS: "-tags=ci"
COVERAGE: "-coverpkg=go-hep.org/x/hep/..."

Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Expand Up @@ -7,7 +7,7 @@ dist: bionic

env:
global:
- ROOT_VERSION=6.20.00
- ROOT_VERSION=6.22.00

cache:
directories:
Expand Down
3 changes: 2 additions & 1 deletion ci/build-cxx-root.go
View file
Expand Up @@ -22,7 +22,7 @@ func main() {
log.SetPrefix("")
log.SetFlags(0)

rvers := flag.String("root-version", "6.18.04", "ROOT version to build")
rvers := flag.String("root-version", "6.22.00", "ROOT version to build")
nproc := flag.Int("j", runtime.NumCPU(), "number of parallel build processes")

flag.Parse()
Expand Down Expand Up @@ -138,6 +138,7 @@ cmake /tmp/root-${ROOT_VERSION} \
-Dtmva=OFF \
-Dvdt=OFF \
-Dx11=OFF \
-Dxrootd=OFF \
;
make -j%[2]d
Expand Down
20 changes: 2 additions & 18 deletions go.sum
View file
@@ -1,9 +1,4 @@
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
gioui.org v0.0.0-20200618124658-602d54dc5ef7/go.mod h1:jiUwifN9cRl/zmco43aAqh0aV+s9GbhG13KcD+gEpkU=
gioui.org v0.0.0-20200626143034-f5985b5e7dea h1:MNnySneyOlWrf32pO+nEuuq54DXwVL5H4xRjyiLh6WE=
gioui.org v0.0.0-20200626143034-f5985b5e7dea/go.mod h1:jiUwifN9cRl/zmco43aAqh0aV+s9GbhG13KcD+gEpkU=
gioui.org v0.0.0-20200627132942-2f8833d985df h1:UIxkr+Z6J9QMETvzJ4e7l/xcxjmw1JCbaVhoj+BRm9E=
gioui.org v0.0.0-20200627132942-2f8833d985df/go.mod h1:jiUwifN9cRl/zmco43aAqh0aV+s9GbhG13KcD+gEpkU=
gioui.org v0.0.0-20200628203458-851255f7a67b h1:2Eb0izWETwD/QZKFwDyyiUlV9cjFXg6Dl/fMfG7EPWU=
gioui.org v0.0.0-20200628203458-851255f7a67b/go.mod h1:jiUwifN9cRl/zmco43aAqh0aV+s9GbhG13KcD+gEpkU=
gioui.org v0.0.0-20200630184602-223f8fd40ae4 h1:Pgz3ROw4pcpdxs62BRaqt4PbBeRHsW+mf5ee92CKZ0M=
Expand Down Expand Up @@ -32,10 +27,6 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-latex/latex v0.0.0-20200518072620-0806b477ea35 h1:uroDDLmuCK5Pz5J/Ef5vCL6F0sJmAtZFTm0/cF027F4=
github.com/go-latex/latex v0.0.0-20200518072620-0806b477ea35/go.mod h1:PNI+CcWytn/2Z/9f1SGOOYn0eILruVyp0v2/iAs8asQ=
github.com/go-mmap/mmap v0.2.0 h1:OF41qHWJBcs4WsBg10aWrdqlnpeGayvnUsP+TxNu3ow=
github.com/go-mmap/mmap v0.2.0/go.mod h1:OefKwIBur8gVp5uxa6XL9/A9epUiKPxXK9POtWGbo5M=
github.com/go-mmap/mmap v0.3.1 h1:Bfz7XJJ9rE+rsafpAFENldl2hGR2jJVCQa8bLGA0YT8=
github.com/go-mmap/mmap v0.3.1/go.mod h1:fj8FQnTozWkngVu+e5ts4ULI4fF65Sx6IDK74aAWUas=
github.com/go-mmap/mmap v0.4.0 h1:FyiBsB7HSMyA81GJjV9BHp/NDjZ6FHiAgwUXk6FKZnU=
github.com/go-mmap/mmap v0.4.0/go.mod h1:fj8FQnTozWkngVu+e5ts4ULI4fF65Sx6IDK74aAWUas=
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
Expand All @@ -62,11 +53,8 @@ github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8
github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8=
github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
github.com/jcmturner/gokrb5 v1.2.3 h1:cVAsP+5SqNm0HwYCokvDaGmxjQ7Q2i9gmq4jm6lHZpc=
github.com/jcmturner/gokrb5 v8.4.0+incompatible h1:AEcxt9/aDFBXuctEsKBoMqidxm5PowAnhw7K5KfSRc4=
github.com/jcmturner/gokrb5/v8 v8.4.0 h1:YhIMzzOSd/9kE5+SahL3m8ygGWE6cB1lKKYYEqpo1hc=
github.com/jcmturner/gokrb5/v8 v8.4.0/go.mod h1:T1hnNppQsBtxW0tCHMHTkAt8n/sABdzZgZdoFrZaZNM=
github.com/jcmturner/gokrb5/v8 v8.4.1 h1:IGSJfqBzMS6TA0oJ7DxXdyzPK563QHa8T2IqER2ggyQ=
github.com/jcmturner/gokrb5/v8 v8.4.1/go.mod h1:T1hnNppQsBtxW0tCHMHTkAt8n/sABdzZgZdoFrZaZNM=
github.com/jcmturner/rpc/v2 v2.0.2 h1:gMB4IwRXYsWw4Bc6o/az2HJgFUA1ffSh90i26ZJ6Xl0=
Expand All @@ -76,8 +64,6 @@ github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 h1:PJr+ZMXIecYc
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc=
github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0=
github.com/klauspost/compress v1.10.9 h1:pPRt1Z78crspaHISkpSSHjDlx+Tt9suHe519dsI0vF4=
github.com/klauspost/compress v1.10.9/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
github.com/klauspost/compress v1.10.10 h1:a/y8CglcM7gLGYmlbP/stPE5sR3hbhFRUjCBfd/0B3I=
github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4=
Expand All @@ -86,7 +72,6 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S
github.com/peterh/liner v1.2.0 h1:w/UPXyl5GfahFxcTOz2j9wCIHNI+pUPr2laqpojKNCg=
github.com/peterh/liner v1.2.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
github.com/pierrec/lz4 v1.0.1 h1:w6GMGWSsCI04fTM8wQRdnW74MuJISakuUU0onU0TYB4=
github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pierrec/xxHash v0.1.5 h1:n/jBpwTHiER4xYvK3/CdPVnLDPchj8eTJFFLUb4QHBo=
Expand All @@ -102,6 +87,7 @@ github.com/sbinet/npyio v0.3.0/go.mod h1:dJ6OpFwUDVVuDSqP5b8paU3yd7Rcs2TZiFimWwD
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/ulikunitz/xz v0.5.7 h1:YvTNdFzX6+W5m9msiYg/zpkSURPPtOlzbqYjrFn7Yt4=
github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
Expand Down Expand Up @@ -183,8 +169,6 @@ gonum.org/v1/gonum v0.7.1-0.20200618223603-4cf9025fcfd1 h1:I8y7pc9JBJGqL5CLk4lWb
gonum.org/v1/gonum v0.7.1-0.20200618223603-4cf9025fcfd1/go.mod h1:L02bwd0sqlsvRv41G7wGWFCsVNZFv/k1xzGIxeANHGM=
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
gonum.org/v1/plot v0.7.1-0.20200619102754-57b3081579f0 h1:xckKLKrCpSJBMlrY3QpvP2K5IYwRYCdoHOh605VnLVI=
gonum.org/v1/plot v0.7.1-0.20200619102754-57b3081579f0/go.mod h1:4pdKXQ8+I1vWp+7PapcCDV0RNuYgg16uqFXps2Xkglw=
gonum.org/v1/plot v0.7.1-0.20200701071522-4260761de856 h1:2Axju2AGxIkAlBR8WYdM1zpGdq5NJEvdwhVxL/P6PKI=
gonum.org/v1/plot v0.7.1-0.20200701071522-4260761de856/go.mod h1:N6YeagiVNq5SGfPX2Xjp+DhSYhFCPU6uzPHWIjEsjVc=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
8 changes: 4 additions & 4 deletions groot/rtree/rw_test.go
View file
Expand Up @@ -726,7 +726,7 @@ func TestTreeRW(t *testing.T) {
}
},
cxx: `************************************
* Row * i32 * f64 *
* Row * i32.i32 * f64.f64 *
************************************
* 0 * 0 * 0 *
* 1 * 1 * 1 *
Expand Down Expand Up @@ -799,7 +799,7 @@ func TestTreeRW(t *testing.T) {
}
},
cxx: `************************************************************************************************************************************************************************
* Row * B * I8 * I16 * I32 * I64 * U8 * U16 * U32 * U64 * F32 * F64 * D16 * D32 *
* Row * B.B * I8.I8 * I16.I16 * I32.I32 * I64.I64 * U8.U8 * U16.U16 * U32.U32 * U64.U64 * F32.F32 * F64.F64 * D16.D16 * D32.D32 *
************************************************************************************************************************************************************************
* 0 * 1 * 0 * 0 * 0 * 0 * 0 * 0 * 0 * 0 * 0 * 0 * 0 * 0 *
* 1 * 0 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 * 1 *
Expand Down Expand Up @@ -832,7 +832,7 @@ func TestTreeRW(t *testing.T) {
}
},
cxx: `************************************************
* Row * i32 * f64 * str *
* Row * i32.i32 * f64.f64 * str.str *
************************************************
* 0 * 0 * 0 * 000 *
* 1 * 1 * 1 * 001 *
Expand Down Expand Up @@ -862,7 +862,7 @@ func TestTreeRW(t *testing.T) {
}
},
cxx: `************************************
* Row * s1 * s2 *
* Row * s1.s1 * s2.s2 *
************************************
* 0 * xxxx * *
* 1 * xxx * x *
Expand Down
2 changes: 1 addition & 1 deletion groot/rvers/versions_gen.go
View file
Expand Up @@ -7,7 +7,7 @@
package rvers

// ROOT version
const ROOT = 62004
const ROOT = 62200

// ROOT classes versions
const (
Expand Down

0 comments on commit 4b4fa01

Please sign in to comment.