From: "Alexander V. Tikhonov" <avtikhon@tarantool.org> To: Alexander Turenko <alexander.turenko@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v3 2/2] gitlab-ci: add Catalina OSX 10.15 Date: Wed, 18 Dec 2019 09:11:12 +0300 [thread overview] Message-ID: <f1d163a51b63d6a686af94700ae00f0f79352866.1576648181.git.avtikhon@tarantool.org> (raw) In-Reply-To: <cover.1576648181.git.avtikhon@tarantool.org> In-Reply-To: <cover.1576648181.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. 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
next prev parent reply other threads:[~2019-12-18 6:11 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-18 6:11 [Tarantool-patches] [PATCH v3 0/2] " Alexander V. Tikhonov 2019-12-18 6:11 ` [Tarantool-patches] [PATCH v3 1/2] build: tune OSX environment Alexander V. Tikhonov 2019-12-18 6:11 ` Alexander V. Tikhonov [this message] 2020-01-20 12:26 ` [Tarantool-patches] [PATCH v3 2/2] gitlab-ci: add Catalina OSX 10.15 Alexander Tikhonov 2020-01-21 16:08 ` 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=f1d163a51b63d6a686af94700ae00f0f79352866.1576648181.git.avtikhon@tarantool.org \ --to=avtikhon@tarantool.org \ --cc=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v3 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