From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Oleg Piskunov <o.piskunov@tarantool.org>,
Sergey Bronnikov <sergeyb@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v1] gitlab-ci: implement OSX 10.14 testing on mac mini
Date: Fri, 27 Mar 2020 10:29:23 +0300 [thread overview]
Message-ID: <29cc7ab2f67a1d98cc72432ede5648b961320aeb.1585288604.git.avtikhon@tarantool.org> (raw)
Switched OSX 10.14 test jobs to MAC mini hosts.
Renamed Gitlab make rule target 'test_%_no_deps' to 'test_%', which is
used to pass all appropriate target calls to Travis make rule target.
---
Github: https://github.com/tarantool/tarantool/tree/avtikhon/osx_on_mini14-full-ci
.gitlab-ci.yml | 19 ++++++-------------
.gitlab.mk | 2 +-
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5177a9903..47e4af5a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,28 +152,21 @@ osx_13_release:
- ${GITLAB_MAKE} vms_test_osx
osx_14_release:
- <<: *vbox_definition
+ <<: *docker_test_definition
tags:
- - vms_osx_14
- variables:
- VMS_NAME: 'osx_14'
- VMS_USER: 'tarantool'
- VMS_PORT: '2222'
+ - osx_14
script:
- - ${GITLAB_MAKE} vms_test_osx
+ - ${GITLAB_MAKE} test_osx
osx_14_release_lto:
<<: *release_only_definition
- <<: *vbox_definition
+ <<: *docker_test_definition
tags:
- - vms_osx_14
+ - osx_14
variables:
EXTRA_ENV: "export CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON ;"
- VMS_NAME: 'osx_14'
- VMS_USER: 'tarantool'
- VMS_PORT: '2222'
script:
- - ${GITLAB_MAKE} vms_test_osx
+ - ${GITLAB_MAKE} test_osx
freebsd_12_release:
<<: *vbox_definition
diff --git a/.gitlab.mk b/.gitlab.mk
index b39c5c651..d804d3cf6 100644
--- a/.gitlab.mk
+++ b/.gitlab.mk
@@ -14,7 +14,7 @@ git_submodule_update:
git submodule update --recursive --init
# Pass *_no_deps goals to .travis.mk.
-test_%_no_deps: git_submodule_update
+test_%: git_submodule_update
${TRAVIS_MAKE} $@
# #######################################################
--
2.17.1
next reply other threads:[~2020-03-27 7:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 7:29 Alexander V. Tikhonov [this message]
2020-03-31 5:34 ` Oleg Piskunov
2020-03-31 9:10 ` Sergey Bronnikov
2020-04-02 7:43 ` Kirill Yukhin
-- strict thread matches above, loose matches on Subject: below --
2020-03-06 12:45 Alexander V. Tikhonov
2020-02-27 7:47 Alexander V. Tikhonov
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=29cc7ab2f67a1d98cc72432ede5648b961320aeb.1585288604.git.avtikhon@tarantool.org \
--to=avtikhon@tarantool.org \
--cc=o.piskunov@tarantool.org \
--cc=sergeyb@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v1] gitlab-ci: implement OSX 10.14 testing on mac mini' \
/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