From 624c5a2510beb74da659527dbe319481aefbd750 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 2 Jul 2019 17:38:43 -0400 Subject: [PATCH] jjb: enable babeltrace python conf on macos Signed-off-by: Michael Jeanson --- jobs/babeltrace.yaml | 78 +++++++++++++++++++++++-------------- scripts/babeltrace/build.sh | 4 +- 2 files changed, 51 insertions(+), 31 deletions(-) diff --git a/jobs/babeltrace.yaml b/jobs/babeltrace.yaml index 22bdc3a..ef6260c 100644 --- a/jobs/babeltrace.yaml +++ b/jobs/babeltrace.yaml @@ -568,35 +568,23 @@ ## Project - project: - name: babeltrace + name: babeltrace1 github_user: efficios github_name: babeltrace email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com' version: - stable-1.5 - - stable-2.0 - - master jobs: - - 'babeltrace_{version}_{buildtype}': - buildtype: build - arch: !!python/tuple [amd64] - build: !!python/tuple [std, oot, dist] - conf: !!python/tuple [std, static, python-bindings, production] - version: - - stable-2.0 - - master - 'babeltrace_{version}_{buildtype}': buildtype: build arch: !!python/tuple [amd64] build: !!python/tuple [std, oot, dist] conf: !!python/tuple [std, static, python-bindings] - version: - - stable-1.5 - 'babeltrace_{version}_{buildtype}': buildtype: portbuild arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] build: !!python/tuple [std] - conf: !!python/tuple [std, static, python-bindings] + conf: !!python/tuple [std, python-bindings] - 'babeltrace_{version}_{buildtype}': buildtype: slesbuild arch: !!python/tuple [sles12sp2] @@ -605,8 +593,6 @@ version: # // support 1.3 on SLES12 - stable-1.3 - stable-1.5 - - stable-2.0 - - master - 'babeltrace_{version}_{buildtype}': buildtype: solarisbuild arch: !!python/tuple [sol10-i386, sol11-i386] @@ -616,11 +602,7 @@ buildtype: macosxbuild arch: !!python/tuple [macosx] build: !!python/tuple [std] - conf: !!python/tuple [std] - version: # macOS support was introduced in 1.4 - - stable-1.5 - - stable-2.0 - - master + conf: !!python/tuple [std, python-bindings, production] - 'babeltrace_{version}_{cctype}': cctype: clangbuild arch: !!python/tuple [amd64] @@ -628,18 +610,57 @@ conf: !!python/tuple [std, static] cc: !!python/tuple [clang-3.9, clang-4.0, clang-6.0, clang-7] - 'babeltrace_{version}_winbuild': - arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64] + arch: !!python/tuple [cygwin, cygwin64] + build: !!python/tuple [std] + conf: !!python/tuple [std] + - 'babeltrace_{version}_cppcheck' + - 'babeltrace_{version}_scan-build' + - 'babeltrace_{version}_pylint' + +- project: + name: babeltrace2 + github_user: efficios + github_name: babeltrace + email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com' + version: + - stable-2.0 + - master + jobs: + - 'babeltrace_{version}_{buildtype}': + buildtype: build + arch: !!python/tuple [amd64] + build: !!python/tuple [std, oot, dist] + conf: !!python/tuple [std, static, python-bindings, production] + - 'babeltrace_{version}_{buildtype}': + buildtype: portbuild + arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386] + build: !!python/tuple [std] + conf: !!python/tuple [std, python-bindings] + - 'babeltrace_{version}_{buildtype}': + buildtype: slesbuild + arch: !!python/tuple [sles12sp2] build: !!python/tuple [std] conf: !!python/tuple [std] - version: # Mingw support was introduced in 2.0 - - stable-2.0 - - master + - 'babeltrace_{version}_{buildtype}': + buildtype: solarisbuild + arch: !!python/tuple [sol10-i386, sol11-i386] + build: !!python/tuple [std] + conf: !!python/tuple [std, static] + - 'babeltrace_{version}_{buildtype}': + buildtype: macosxbuild + arch: !!python/tuple [macosx] + build: !!python/tuple [std] + conf: !!python/tuple [std, python-bindings, production] + - 'babeltrace_{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] - 'babeltrace_{version}_winbuild': - arch: !!python/tuple [cygwin, cygwin64] + arch: !!python/tuple [cygwin, cygwin64, msys2-mingw32, msys2-mingw64] build: !!python/tuple [std] conf: !!python/tuple [std] - version: # Cygwin support was introduced in 1.5 - - stable-1.5 - 'babeltrace_{version}_cppcheck' - 'babeltrace_{version}_scan-build' - 'babeltrace_{version}_pylint' @@ -648,7 +669,6 @@ - 'babeltrace_{version}_glib-2.22.5': version: master - - project: name: babeltrace-jgalar-staging user: jgalar diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh index bab025d..92c47ed 100755 --- a/scripts/babeltrace/build.sh +++ b/scripts/babeltrace/build.sh @@ -215,7 +215,7 @@ python-bindings) echo "Build with python bindings" # We only support bindings built with Python 3 export PYTHON="python3" - export PYTHON_CONFIG="/usr/bin/python3-config" + export PYTHON_CONFIG="python3-config" CONF_OPTS="--enable-python-bindings" if vergte "$PACKAGE_VERSION" "2.0"; then @@ -232,7 +232,7 @@ production) # Enable the python bindings export PYTHON="python3" - export PYTHON_CONFIG="/usr/bin/python3-config" + export PYTHON_CONFIG="python3-config" CONF_OPTS="--enable-python-bindings --enable-python-bindings-doc --enable-python-plugins" ;; *) -- 2.34.1