From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp54.i.mail.ru (smtp54.i.mail.ru [217.69.128.34]) (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 6BC1645C306 for ; Fri, 11 Dec 2020 19:56:32 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Fri, 11 Dec 2020 19:56:25 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v1 2/3] Implement OSX commit testing on github-ci action List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Oleg Koshovetc , Timur Safin , Kirill Yukhin Cc: tarantool-patches@dev.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