<HTML><BODY><div>LGTM<br><br> <blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">Пятница, 27 марта 2020, 10:29 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:<br> <div id=""><div class="js-helper js-readmsg-msg"><style type="text/css"></style><div><div id="style_15852941650737295429_BODY">Switched OSX 10.14 test jobs to MAC mini hosts.<br>Renamed Gitlab make rule target 'test_%_no_deps' to 'test_%', which is<br>used to pass all appropriate target calls to Travis make rule target.<br>---<br><br>Github: <a href="https://github.com/tarantool/tarantool/tree/avtikhon/osx_on_mini14-full-ci" target="_blank">https://github.com/tarantool/tarantool/tree/avtikhon/osx_on_mini14-full-ci</a><br><br> .gitlab-ci.yml | 19 ++++++-------------<br> .gitlab.mk | 2 +-<br> 2 files changed, 7 insertions(+), 14 deletions(-)<br><br>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml<br>index 5177a9903..47e4af5a2 100644<br>--- a/.gitlab-ci.yml<br>+++ b/.gitlab-ci.yml<br>@@ -152,28 +152,21 @@ osx_13_release:<br> - ${GITLAB_MAKE} vms_test_osx<br> <br> osx_14_release:<br>- <<: *vbox_definition<br>+ <<: *docker_test_definition<br> tags:<br>- - vms_osx_14<br>- variables:<br>- VMS_NAME: 'osx_14'<br>- VMS_USER: 'tarantool'<br>- VMS_PORT: '2222'<br>+ - osx_14<br> script:<br>- - ${GITLAB_MAKE} vms_test_osx<br>+ - ${GITLAB_MAKE} test_osx<br> <br> osx_14_release_lto:<br> <<: *release_only_definition<br>- <<: *vbox_definition<br>+ <<: *docker_test_definition<br> tags:<br>- - vms_osx_14<br>+ - osx_14<br> variables:<br> EXTRA_ENV: "export CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON ;"<br>- VMS_NAME: 'osx_14'<br>- VMS_USER: 'tarantool'<br>- VMS_PORT: '2222'<br> script:<br>- - ${GITLAB_MAKE} vms_test_osx<br>+ - ${GITLAB_MAKE} test_osx<br> <br> freebsd_12_release:<br> <<: *vbox_definition<br>diff --git a/.gitlab.mk b/.gitlab.mk<br>index b39c5c651..d804d3cf6 100644<br>--- a/.gitlab.mk<br>+++ b/.gitlab.mk<br>@@ -14,7 +14,7 @@ git_submodule_update:<br> git submodule update --recursive --init<br> <br> # Pass *_no_deps goals to .travis.mk.<br>-test_%_no_deps: git_submodule_update<br>+test_%: git_submodule_update<br> ${TRAVIS_MAKE} $@<br> <br> # #######################################################<br>--<br>2.17.1<br> </div></div></div></div></blockquote> <div> </div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Oleg Piskunov</div></div></div><div> </div></div></BODY></HTML>