From: "Alexander V. Tikhonov" <avtikhon@tarantool.org> To: Kirill Yukhin <kyukhin@tarantool.org>, Igor Munkin <imun@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v1 5/5] gitlab-ci: add out-of-source build Date: Wed, 14 Oct 2020 11:35:26 +0300 [thread overview] Message-ID: <dcdcc168c316aa4d74a0566c8d520dcaa23eeaa0.1602663758.git.avtikhon@tarantool.org> (raw) In-Reply-To: <0a48783b74bcb4fbdb3ff6f3decc79bded564bec.1602663758.git.avtikhon@tarantool.org> Implemented out-of-source build at cmake files. Added out of source build make targets and added test job to gitlab-ci. Closes #4874 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4874-out-of-source-build-full-ci Issue: https://github.com/tarantool/tarantool/issues/4874 V2: removed changes not for gitlab-ci. .gitlab-ci.yml | 7 +++++++ .travis.mk | 26 +++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d40dc74e3..d5dc52f82 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -174,6 +174,13 @@ luacheck: # Tests +out_of_source: + stage: test + tags: + - deploy_test + script: + - ${GITLAB_MAKE} test_oos_build + release: <<: *docker_test_definition script: diff --git a/.travis.mk b/.travis.mk index d797472e2..5730e1097 100644 --- a/.travis.mk +++ b/.travis.mk @@ -7,7 +7,9 @@ DOCKER_IMAGE_TARANTOOL="registry.gitlab.com/tarantool/tarantool/testing/debian-s TEST_RUN_EXTRA_PARAMS?= MAX_FILES?=65534 MAX_PROC?=2500 -OOS_SRC_PATH="/source" +OOS_SRC_PATH?="/source" +OOS_BUILD_PATH?="/rw_bins" +OOS_BUILD_RULE?=test_oos_no_deps BIN_DIR=/usr/local/bin OSX_VARDIR?=/tmp/tnt @@ -207,6 +209,28 @@ test_debian_install_luacheck: test_debian_luacheck: test_debian_install_luacheck configure_debian make luacheck +# Out-Of-Source build + +build_oos: + mkdir ${OOS_BUILD_PATH} 2>/dev/null || : ; \ + cd ${OOS_BUILD_PATH} && \ + cmake ${OOS_SRC_PATH} ${CMAKE_EXTRA_PARAMS} && \ + make -j + +test_oos_no_deps: build_oos + cd ${OOS_BUILD_PATH}/test && \ + ${OOS_SRC_PATH}/test/test-run.py \ + --builddir ${OOS_BUILD_PATH} \ + --vardir ${OOS_BUILD_PATH}/test/var --force + +test_oos: deps_debian test_oos_no_deps + +test_oos_build: + docker run --network=host -w ${OOS_SRC_PATH} \ + --mount type=bind,source="${PWD}",target=${OOS_SRC_PATH},readonly,bind-propagation=rslave \ + -i ${DOCKER_IMAGE_TARANTOOL} \ + make -f .travis.mk ${OOS_BUILD_RULE} + ####### # OSX # ####### -- 2.25.1
next prev parent reply other threads:[~2020-10-14 8:35 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-14 8:27 [Tarantool-patches] [PATCH v1 1/5] curl: enable curl build with old cmake Alexander V. Tikhonov 2020-10-14 8:29 ` [Tarantool-patches] [PATCH v1 2/5] build: set include path to bootstrap.h Alexander V. Tikhonov 2020-10-15 9:18 ` Igor Munkin 2021-03-12 8:55 ` Kirill Yukhin via Tarantool-patches 2020-10-14 8:30 ` [Tarantool-patches] [PATCH v1 3/5] build: correct destination build directory Alexander V. Tikhonov 2020-10-15 12:24 ` Igor Munkin 2020-10-14 8:35 ` Alexander V. Tikhonov [this message] 2020-10-15 12:30 ` [Tarantool-patches] [PATCH v2 5/5] gitlab-ci: add out-of-source build Igor Munkin 2020-10-14 9:25 ` [Tarantool-patches] [PATCH v4 4/5] build: enable cmake in curl build Alexander V. Tikhonov 2020-10-15 14:17 ` Igor Munkin 2020-10-15 19:00 ` Alexander V. Tikhonov 2020-10-15 20:43 ` Igor Munkin 2020-10-15 12:23 ` [Tarantool-patches] [PATCH v1 1/5] curl: enable curl build with old cmake Igor Munkin 2020-10-16 6:55 ` Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=dcdcc168c316aa4d74a0566c8d520dcaa23eeaa0.1602663758.git.avtikhon@tarantool.org \ --to=avtikhon@tarantool.org \ --cc=imun@tarantool.org \ --cc=kyukhin@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v1 5/5] gitlab-ci: add out-of-source build' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox