From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp50.i.mail.ru (smtp50.i.mail.ru [94.100.177.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 6E19D4696C3 for ; Tue, 31 Mar 2020 12:10:15 +0300 (MSK) Date: Tue, 31 Mar 2020 12:10:12 +0300 From: Sergey Bronnikov Message-ID: <20200331091012.GA50331@pony.bronevichok.ru> References: <29cc7ab2f67a1d98cc72432ede5648b961320aeb.1585288604.git.avtikhon@tarantool.org> <1585632883.636269821@f389.i.mail.ru> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1585632883.636269821@f389.i.mail.ru> Subject: Re: [Tarantool-patches] [PATCH v1] gitlab-ci: implement OSX 10.14 testing on mac mini List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Oleg Piskunov Cc: tarantool-patches@dev.tarantool.org LGTM On 08:34 Tue 31 Mar , Oleg Piskunov wrote: > > LGTM > >   > >Пятница, 27 марта 2020, 10:29 +03:00 от Alexander V. Tikhonov : > >  > >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 > >  >   >   > -- > Oleg Piskunov >   -- sergeyb@