Четверг, 30 апреля 2020, 15:23 +03:00 от Alexander V. Tikhonov <avtikhon@tarantool.org>:
 

Added Catalina OSX 10.15 to gitlab-ci testing and removed OSX 10.13,
due to decided to have only 2 last major releases, for now it is
10.14 and 10.15 OSX versions. Also changed the commit job for branches
from 10.14 to 10.15 OSX version.

Close #4873
---

Github: https://github.com/tarantool/tarantool/tree/avtikhon/osx_15_catalina-full-ci
Issue: https://github.com/tarantool/tarantool/issues/4873

 .gitlab-ci.yml | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd265aa60..09feda7f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,32 +139,28 @@ release_asan_clang8:
   script:
     - ${GITLAB_MAKE} test_asan_debian_no_deps
 
-osx_13_release:
+osx_14_release:
   <<: *release_only_definition
- <<: *vbox_definition
+ stage: test
   tags:
- - vms_osx_13
- variables:
- VMS_NAME: 'osx_13'
- VMS_USER: 'tarantool'
- VMS_PORT: '2212'
+ - osx_14
   script:
- - ${GITLAB_MAKE} vms_test_osx
+ - ${GITLAB_MAKE} test_osx
 
-osx_14_release:
- <<: *docker_test_definition
+osx_15_release:
+ stage: test
   tags:
- - osx_14
+ - osx_15
   script:
     - ${GITLAB_MAKE} test_osx
 
-osx_14_release_lto:
+osx_15_release_lto:
   <<: *release_only_definition
- <<: *docker_test_definition
+ stage: test
   tags:
- - osx_14
+ - osx_15
   variables:
- EXTRA_ENV: "export CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON ;"
+ EXTRA_ENV: 'export CMAKE_EXTRA_PARAMS=-DENABLE_LTO=ON ;'
   script:
     - ${GITLAB_MAKE} test_osx
 
--
2.17.1