Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Oleg Piskunov <o.piskunov@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v5 2/2] gitlab-ci: add Catalina OSX 10.15
Date: Wed, 22 Jan 2020 10:28:49 +0300	[thread overview]
Message-ID: <0278fcbd4d70c634e323137d07a289f10d62b753.1579677934.git.avtikhon@tarantool.org> (raw)
In-Reply-To: <cover.1579677934.git.avtikhon@tarantool.org>
In-Reply-To: <cover.1579677934.git.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.
---
 .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

  parent reply	other threads:[~2020-01-22  7:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-22  7:28 [Tarantool-patches] [PATCH v5 0/2] add Catalina OSX 10.15 to gitlab-ci Alexander V. Tikhonov
2020-01-22  7:28 ` [Tarantool-patches] [PATCH v5 1/2] build: tune OSX environment Alexander V. Tikhonov
2020-01-22 10:58   ` Oleg Piskunov
2020-01-22  7:28 ` Alexander V. Tikhonov [this message]
2020-01-22 10:57   ` [Tarantool-patches] [PATCH v5 2/2] gitlab-ci: add Catalina OSX 10.15 Oleg Piskunov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0278fcbd4d70c634e323137d07a289f10d62b753.1579677934.git.avtikhon@tarantool.org \
    --to=avtikhon@tarantool.org \
    --cc=o.piskunov@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v5 2/2] gitlab-ci: add Catalina OSX 10.15' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox