From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <avtikhon@tarantool.org>
Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251])
 (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 4368B46970E
 for <tarantool-patches@dev.tarantool.org>;
 Wed, 22 Jan 2020 10:28:54 +0300 (MSK)
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Wed, 22 Jan 2020 10:28:49 +0300
Message-Id: <0278fcbd4d70c634e323137d07a289f10d62b753.1579677934.git.avtikhon@tarantool.org>
In-Reply-To: <cover.1579677934.git.avtikhon@tarantool.org>
References: <cover.1579677934.git.avtikhon@tarantool.org>
In-Reply-To: <cover.1579677934.git.avtikhon@tarantool.org>
References: <cover.1579677934.git.avtikhon@tarantool.org>
Subject: [Tarantool-patches] [PATCH v5 2/2] gitlab-ci: add Catalina OSX 10.15
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: Oleg Piskunov <o.piskunov@tarantool.org>
Cc: tarantool-patches@dev.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.
---
 .gitlab-ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3af5a3c8a..7beb8ec08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,19 +90,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
   <<: *vbox_definition
   tags:
     - vms_osx_14
-- 
2.17.1