groot: bump to ROOT-6.26/00

go-hep · Mar 10, 2022 · e6d5f90 · e6d5f90
1 parent 6f88941
commit e6d5f90
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 57 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   GOPROXY: "https://proxy.golang.org"
-  ROOT_VERSION: "6.24.00"
+  ROOT_VERSION: "6.26.00"
   TAGS: "-tags=ci"
   COVERAGE: "-coverpkg=go-hep.org/x/hep/..."
   EGL_PLATFORM: "x11"

diff --git a/ci/build-cxx-root.go b/ci/build-cxx-root.go
@@ -22,7 +22,7 @@ func main() {
 	log.SetPrefix("")
 	log.SetFlags(0)
 
-	rvers := flag.String("root-version", "6.24.00", "ROOT version to build")
+	rvers := flag.String("root-version", "6.26.00", "ROOT version to build")
 	nproc := flag.Int("j", runtime.NumCPU(), "number of parallel build processes")
 
 	flag.Parse()
@@ -56,11 +56,13 @@ func build(rvers string, nproc int) {
 	}
 
 	cmd := exec.Command("docker", "run", "--rm",
+		"--network=host",
 		"-v", fname+":/build.sh",
 		"-v", bdir+":/build/src",
 		"-v", dst+":/build/install",
-		"ubuntu:bionic", "/bin/sh", "/build.sh",
+		"ubuntu:20.04", "/bin/sh", "/build.sh",
 	)
+	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 
@@ -90,12 +92,14 @@ const docker = `#!/bin/sh
 set -e
 set -x
 
-apt-get update -y
-apt-get install -y -q \
+export DEBIAN_FRONTEND=noninteractive
+
+apt update  -yq
+apt install -yq    \
 		cmake curl \
-		g++ git \
-		python \
-		;
+		g++ git    \
+		python     \
+;
 
 export ROOT_VERSION="%[1]s"
 

diff --git a/ci/install-cxx-root.go b/ci/install-cxx-root.go
@@ -23,8 +23,10 @@ func main() {
 	log.SetPrefix("")
 	log.SetFlags(0)
 
-	rvers := flag.String("root-version", "6.24.00", "ROOT version to install")
-	odir := flag.String("o", "", "install directory for ROOT")
+	var (
+		rvers = flag.String("root-version", "6.26.00", "ROOT version to install")
+		odir  = flag.String("o", "", "install directory for ROOT")
+	)
 
 	flag.Parse()
 

diff --git a/groot/gen.rboot.go b/groot/gen.rboot.go
@@ -171,13 +171,17 @@ void genstreamers(const char* fname) {
 		log.Fatalf("missing streamers: got=%d, want=%d", got, want)
 	}
 
-	f, err := os.Create("rdict/cxx_root_streamers_gen.go")
+	var (
+		fname = "rdict/cxx_root_streamers_gen.go"
+		year  = genroot.ExtractYear(fname)
+	)
+	f, err := os.Create(fname)
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer f.Close()
 
-	_, err = f.Write([]byte(`// Copyright ©2022 The go-hep Authors. All rights reserved.
+	_, err = f.Write([]byte(fmt.Sprintf(`// Copyright ©%d The go-hep Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -192,7 +196,7 @@ import (
 )
 
 func init() {
-`))
+`, year)))
 	if err != nil {
 		log.Fatalf("could not write groot streamers header: %+v", err)
 	}