From 9a07183cc9c8aa389f227c4455b8e33c3a386837 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 27 Jun 2022 15:37:00 -0400 Subject: [PATCH] jjb: librseq: update for ubuntu 22.04 builders Change-Id: I1ec5874d9e8ec3e60810907332d87f6fad33a0cc --- jobs/librseq.yaml | 69 +++++++++++++++++++++++----------------- scripts/librseq/build.sh | 48 +++++----------------------- 2 files changed, 47 insertions(+), 70 deletions(-) diff --git a/jobs/librseq.yaml b/jobs/librseq.yaml index abe3af9..1c8884b 100644 --- a/jobs/librseq.yaml +++ b/jobs/librseq.yaml @@ -57,41 +57,49 @@ name: 'librseq_build_axes_defaults' project-type: matrix node: 'master' # Applies only to matrix flyweight task + execution-strategy: + touchstone: + expr: '{touchstone}' + result: unstable axes: - axis: type: slave - name: arch - values: '{obj:arch}' + name: platform + values: '{obj:platforms}' - axis: type: user-defined name: conf - values: '{obj:conf}' + values: '{obj:confs}' - axis: type: user-defined name: build - values: '{obj:build}' + values: '{obj:builds}' - librseq_build_axes_cc: &librseq_build_axes_cc name: 'librseq_build_axes_cc' project-type: matrix node: 'master' # Applies only to matrix flyweight task + execution-strategy: + touchstone: + expr: '{touchstone}' + result: unstable axes: - axis: type: slave - name: arch - values: '{obj:arch}' + name: platform + values: '{obj:platforms}' - axis: type: user-defined name: conf - values: '{obj:conf}' + values: '{obj:confs}' - axis: type: user-defined name: build - values: '{obj:build}' + values: '{obj:builds}' - axis: type: user-defined name: cc - values: '{obj:cc}' + values: '{obj:ccs}' - librseq_build_builders_defaults: &librseq_build_builders_defaults name: 'librseq_build_builders_defaults' @@ -339,30 +347,30 @@ jobs: - 'librseq_{version}_{buildtype}': buildtype: build - arch: !!python/tuple [amd64] - build: !!python/tuple [std, oot, dist, oot-dist] - conf: !!python/tuple [std, static] + platforms: !!python/tuple [jammy-amd64] + builds: !!python/tuple [std, oot, dist, oot-dist] + confs: !!python/tuple [std, static] + touchstone: '(build == "std") && (conf == "std")' - 'librseq_{version}_{cctype}': cctype: gccbuild - arch: !!python/tuple [amd64] - build: !!python/tuple [std] - conf: !!python/tuple [std, static] - cc: !!python/tuple [gcc-4.8, gcc-5, gcc-6, gcc-7, gcc-8] + platforms: !!python/tuple [jammy-amd64] + builds: !!python/tuple [std] + confs: !!python/tuple [std, static] + ccs: !!python/tuple [gcc-9, gcc-10, gcc-11, gcc-12] + touchstone: '(build == "std") && (conf == "std") && (cc == "gcc-11")' - 'librseq_{version}_{cctype}': cctype: clangbuild - arch: !!python/tuple [amd64] - build: !!python/tuple [std] - conf: !!python/tuple [std, static] - cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7] + platforms: !!python/tuple [jammy-amd64] + builds: !!python/tuple [std] + confs: !!python/tuple [std, static] + ccs: !!python/tuple [clang-11, clang-12, clang-13, clang-14] + touchstone: '(build == "std") && (conf == "std") && (cc == "clang-14")' - 'librseq_{version}_{buildtype}': buildtype: portbuild - arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] - build: !!python/tuple [std] - conf: !!python/tuple [std, static] -# - 'librseq_{version}_cppcheck' -# - 'librseq_{version}_scan-build' -# - 'librseq_{version}_coverity': -# version: master + platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386] + builds: !!python/tuple [std] + confs: !!python/tuple [std, static] + touchstone: '(build == "std") && (conf == "std") && (platform == "deb11-i386")' - project: name: gerrit-librseq @@ -371,9 +379,10 @@ jobs: - 'dev_gerrit_librseq_{buildtype}': buildtype: build - arch: !!python/tuple [amd64] - build: !!python/tuple [std, oot, dist, oot-dist] - conf: !!python/tuple [std, static] + platforms: !!python/tuple [jammy-amd64] + builds: !!python/tuple [std, oot, dist, oot-dist] + confs: !!python/tuple [std, static] + touchstone: '(build == "std") && (conf == "std")' - project: name: librseq-views diff --git a/scripts/librseq/build.sh b/scripts/librseq/build.sh index 1a2d852..d56a399 100755 --- a/scripts/librseq/build.sh +++ b/scripts/librseq/build.sh @@ -84,7 +84,7 @@ failed_configure() { # Required variables WORKSPACE=${WORKSPACE:-} -arch=${arch:-} +platform=${platform:-} conf=${conf:-} build=${build:-} cc=${cc:-} @@ -111,49 +111,17 @@ gcc) export CC=gcc export CXX=g++ ;; -gcc-4.8) - export CC=gcc-4.8 - export CXX=g++-4.8 - ;; -gcc-5) - export CC=gcc-5 - export CXX=g++-5 - ;; -gcc-6) - export CC=gcc-6 - export CXX=g++-6 - ;; -gcc-7) - export CC=gcc-7 - export CXX=g++-7 - ;; -gcc-8) - export CC=gcc-8 - export CXX=g++-8 +gcc-*) + export CC=gcc-${cc#gcc-} + export CXX=g++-${cc#gcc-} ;; clang) export CC=clang export CXX=clang++ ;; -clang-3.9) - export CC=clang-3.9 - export CXX=clang++-3.9 - ;; -clang-4.0) - export CC=clang-4.0 - export CXX=clang++-4.0 - ;; -clang-5.0) - export CC=clang-5.0 - export CXX=clang++-5.0 - ;; -clang-6.0) - export CC=clang-6.0 - export CXX=clang++-6.0 - ;; -clang-7) - export CC=clang-7 - export CXX=clang++-7 +clang-*) + export CC=clang-${cc#clang-} + export CXX=clang++-${cc#clang-} ;; *) if [ "x$cc" != "x" ]; then @@ -168,7 +136,7 @@ if [ "x${CC:-}" != "x" ]; then fi # Set platform variables -case "$arch" in +case "$platform" in *) export MAKE=make export TAR=tar -- 2.34.1