From 3793750ebda5a44c16200224dca4ccfb546e7c3f Mon Sep 17 00:00:00 2001 From: Giulio Eulisse Date: Mon, 16 Mar 2020 16:58:57 +0100 Subject: [PATCH] Bump to v5-09-20k --- defaults-alo.sh | 2 +- defaults-prod-latest.sh | 4 ++-- defaults-root6.sh | 4 ++-- defaults-user-root6.sh | 4 ++-- defaults-user.sh | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/defaults-alo.sh b/defaults-alo.sh index 2a26a3350b..d4c89b617c 100644 --- a/defaults-alo.sh +++ b/defaults-alo.sh @@ -54,7 +54,7 @@ overrides: prefer_system_check: | printf "#include \"gsl/gsl_version.h\"\n#define GSL_V GSL_MAJOR_VERSION * 100 + GSL_MINOR_VERSION\n# if (GSL_V < 116)\n#error \"Cannot use system's gsl. Notice we only support versions from 1.16 (included)\"\n#endif\nint main(){}" | gcc -I$(brew --prefix gsl)/include -xc++ - -o /dev/null AliRoot: - tag: "v5-09-20j" + tag: "v5-09-20k" protobuf: version: "%(tag_basename)s" tag: "v3.0.2" diff --git a/defaults-prod-latest.sh b/defaults-prod-latest.sh index 53ece062ab..bbc0574762 100644 --- a/defaults-prod-latest.sh +++ b/defaults-prod-latest.sh @@ -7,10 +7,10 @@ env: overrides: AliRoot: version: "%(tag_basename)s" - tag: v5-09-20j + tag: v5-09-20k AliPhysics: version: "%(tag_basename)s" - tag: v5-09-20j-01 + tag: v5-09-20k-01 --- # To be used with aliBuild option `--defaults prod-latest`. # diff --git a/defaults-root6.sh b/defaults-root6.sh index 608607d984..9877035105 100644 --- a/defaults-root6.sh +++ b/defaults-root6.sh @@ -30,10 +30,10 @@ overrides: printf "#include \"gsl/gsl_version.h\"\n#define GSL_V GSL_MAJOR_VERSION * 100 + GSL_MINOR_VERSION\n# if (GSL_V < 116)\n#error \"Cannot use system's gsl. Notice we only support versions from 1.16 (included)\"\n#endif\nint main(){}" | gcc -I$(brew --prefix gsl)/include -xc++ - -o /dev/null AliRoot: version: "%(commit_hash)s_ROOT6" - tag: v5-09-20j + tag: v5-09-20k AliPhysics: version: "%(commit_hash)s_ROOT6" - tag: v5-09-20j-01 + tag: v5-09-20k-01 --- # This file is included in any build recipe and it's only used to set # environment variables. Which file to actually include can be defined by the diff --git a/defaults-user-root6.sh b/defaults-user-root6.sh index de32873646..65381f5070 100644 --- a/defaults-user-root6.sh +++ b/defaults-user-root6.sh @@ -7,14 +7,14 @@ env: overrides: AliRoot: version: "%(tag_basename)s" - tag: v5-09-20j + tag: v5-09-20k requires: - ROOT - fastjet:(?!.*ppc64) - Vc AliPhysics: version: "%(tag_basename)s" - tag: v5-09-20j-01 + tag: v5-09-20k-01 ROOT: version: "%(tag_basename)s" version: "%(tag_basename)s" diff --git a/defaults-user.sh b/defaults-user.sh index 39a36671fa..7c266e82aa 100644 --- a/defaults-user.sh +++ b/defaults-user.sh @@ -7,14 +7,14 @@ env: overrides: AliRoot: version: "%(tag_basename)s" - tag: v5-09-20j + tag: v5-09-20k requires: - ROOT - fastjet:(?!.*ppc64) - Vc AliPhysics: version: "%(tag_basename)s" - tag: v5-09-20j-01 + tag: v5-09-20k-01 --- # To be used with aliBuild option `--defaults user`. #