Tarantool development patches archive
 help / color / mirror / Atom feed
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
To: Oleg Koshovetc <okoshovetc@tarantool.org>,
	Timur Safin <tsafin@tarantool.org>,
	Kirill Yukhin <kyukhin@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH v1 2/3] Implement OSX commit testing on github-ci action
Date: Fri, 11 Dec 2020 19:56:25 +0300	[thread overview]
Message-ID: <da6bdbe9d0e4a5a2b765177b2206c816c4388a91.1607705412.git.avtikhon@tarantool.org> (raw)
In-Reply-To: <cover.1607705412.git.avtikhon@tarantool.org>

Implemented github-ci action workflow OSX jobs on commits:
 - OSX 10.15
 - OSX 11.0

Part of #5294
---
 .github/workflows/ci.yml | 30 ++++++++++++++++++++++++++++++
 .travis.mk               | 13 +++++++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f16cc5dff..94ded455f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -114,3 +114,33 @@ jobs:
           submodules: recursive
       - name: test
         run: ${TRAVIS_MAKE} test_asan_debian_no_deps
+
+  osx_10_15:
+    runs-on: macos-10.15
+    #runs-on: self-hosted
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+      - name: test
+        run: ${TRAVIS_MAKE} test_osx_github_actions
+
+  osx_11_0:
+    runs-on: macos-11.0
+    #runs-on: self-hosted
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v2.3.4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+      - name: test
+        run: ${TRAVIS_MAKE} test_osx_github_actions
diff --git a/.travis.mk b/.travis.mk
index 238e31cda..985385d20 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -236,8 +236,9 @@ test_oos_build:
 #######
 
 # since Python 2 is EOL it's latest commit from tapped local formula is used
-OSX_PKGS=openssl readline curl icu4c libiconv zlib autoconf automake libtool \
-	cmake file://$${PWD}/tools/brew_taps/tntpython2.rb
+OSX_PKGS_MIN=openssl readline curl icu4c libiconv zlib autoconf automake libtool \
+	cmake
+OSX_PKGS=${OSX_PKGS_MIN} file://$${PWD}/tools/brew_taps/tntpython2.rb
 
 deps_osx:
 	# install brew using command from Homebrew repository instructions:
@@ -252,6 +253,12 @@ deps_osx:
 	brew install --force ${OSX_PKGS} || brew upgrade ${OSX_PKGS}
 	pip install --force-reinstall -r test-run/requirements.txt
 
+deps_osx_github_actions:
+	# try to install the packages either upgrade it to avoid of fails
+	# if the package already exists with the previous version
+	brew install --force ${OSX_PKGS_MIN} || brew upgrade ${OSX_PKGS_MIN}
+	pip install --force-reinstall -r test-run/requirements.txt
+
 build_osx:
 	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}
 	make -j
@@ -282,6 +289,8 @@ test_osx_no_deps: build_osx
 
 test_osx: deps_osx test_osx_no_deps
 
+test_osx_github_actions: deps_osx_github_actions test_osx_no_deps
+
 # Static macOS build
 
 STATIC_OSX_PKGS=autoconf automake libtool cmake file://$${PWD}/tools/brew_taps/tntpython2.rb
-- 
2.25.1

  parent reply	other threads:[~2020-12-11 16:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-11 16:56 [Tarantool-patches] [PATCH v1 0/3] Initiate " Alexander V. Tikhonov
2020-12-11 16:56 ` [Tarantool-patches] [PATCH v1 1/3] " Alexander V. Tikhonov
2020-12-11 16:56 ` Alexander V. Tikhonov [this message]
2020-12-11 16:56 ` [Tarantool-patches] [PATCH v1 3/3] Switch coverage saving from travis-ci to github-ci Alexander V. Tikhonov

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=da6bdbe9d0e4a5a2b765177b2206c816c4388a91.1607705412.git.avtikhon@tarantool.org \
    --to=avtikhon@tarantool.org \
    --cc=kyukhin@tarantool.org \
    --cc=okoshovetc@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --cc=tsafin@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v1 2/3] Implement OSX commit testing on github-ci action' \
    /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