[Tarantool-patches] [PATCH v1 2/2] gitlab-ci: add Catalina OSX 10.15

Alexander V. Tikhonov avtikhon at tarantool.org
Thu Apr 9 11:40:59 MSK 2020


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.

Added to OSX 10.15 additional call to /etc/profile to setup the PATH,
otherwise it doesn't have the path to brew installed packages.
---
 .gitlab-ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd710027f..5c9f353a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,19 +139,20 @@ release_asan_clang8:
   script:
     - ${GITLAB_MAKE} test_asan_debian_no_deps
 
-osx_13_release:
-  <<: *release_only_definition
+osx_15_release:
   <<: *vbox_definition
   tags:
-    - vms_osx_13
+    - vms_osx_15
   variables:
-    VMS_NAME: 'osx_13'
+    EXTRA_ENV: '. /etc/profile ;'
+    VMS_NAME: 'osx_15'
     VMS_USER: 'tarantool'
-    VMS_PORT: '2212'
+    VMS_PORT: '2242'
   script:
     - ${GITLAB_MAKE} vms_test_osx
 
 osx_14_release:
+  <<: *release_only_definition
   <<: *docker_test_definition
   tags:
     - osx_14
-- 
2.17.1



More information about the Tarantool-patches mailing list