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

[Alexander Tikhonov]

Oleg,
Please review the patch.

>Среда, 18 декабря 2019, 9:11 +03:00 от Alexander V. Tikhonov <avtikhon at 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.
>
>Added path in environment to reach the pip binary that was additionally
>installed based on python2 version in addition to pip3 which is the
>default in Catalina OSX 10.15.
>---
> .gitlab-ci.yml |  8 ++++----
> .travis.mk     | 11 ++++++++++-
> 2 files changed, 14 insertions(+), 5 deletions(-)
>
>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>index 3af5a3c8a..d3cb959d0 100644
>--- a/.gitlab-ci.yml
>+++ b/.gitlab-ci.yml
>@@ -90,15 +90,15 @@ release_asan_clang8:
>   script:
>     - ${GITLAB_MAKE} test_asan_debian_no_deps
> 
>-osx_13_release:
>+osx_15_release:
>   <<: *release_only_definition
>   <<: *vbox_definition
>   tags:
>-    - vms_osx_13
>+    - vms_test
>   variables:
>-    VMS_NAME: 'osx_13'
>+    VMS_NAME: 'osx_15'
>     VMS_USER: 'tarantool'
>-    VMS_PORT: '2212'
>+    VMS_PORT: '2242'
>   script:
>     - ${GITLAB_MAKE} vms_test_osx
> 
>diff --git a/.travis.mk b/.travis.mk
>index 35d9a4f7e..b2ecdd87d 100644
>--- a/.travis.mk
>+++ b/.travis.mk
>@@ -142,10 +142,19 @@ deps_osx:
> 	# if the package already exists with the previous version
> 	export PATH=${PATH}:/usr/local/bin ; \
> 		brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}
>+	# OSX 10.15 Catalina started to use Xcode 11 which has 'Deprications'
>+	# part in Release Notes:
>+	#   Use of Python 2.7 isn’t recommended. This version is included in
>+	#   macOS for compatibility with legacy software. Future versions of
>+	#   macOS won’t include Python 2.7. Instead, it’s recommended that
>+	#   you run python3 in Terminal. (51097165)
> 	python2 -V || brew install python2 --force
> 	curl --silent --show-error --retry 5  https://bootstrap.pypa.io/get-pip.py >get-pip.py
> 	python get-pip.py --user
>-	pip install --user --force-reinstall -r test-run/requirements.txt
>+	# To make pip tools available, the PATH environment must include the
>+	# path to its binaries
>+	export PATH=${PATH}:/Users/tarantool/Library/Python/2.7/bin ; \
>+		pip install --user --force-reinstall -r test-run/requirements.txt
> 
> build_osx:
> 	export PATH=${PATH}:/usr/local/bin ; \
>-- 
>2.17.1
>


-- 
Alexander Tikhonov
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.tarantool.org/pipermail/tarantool-patches/attachments/20200120/09ee2b92/attachment.html>