From ebd87543a6ff59df18697ed3e360c0c179a5112f Mon Sep 17 00:00:00 2001
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Tue, 15 Jun 2021 13:19:17 +0300
Subject: [PATCH] github-ci: refactor OSX jobs parameters
To avoid targets duplication in the later use of .travis.mk file, it was
decided to parameterize OSX jobs and move all fine tuning manipulations
related to these pipelines from .travis.mk to the corresponding GitHub
Actions workflows.
---
.github/workflows/osx_10_15.yml | 3 +++
.github/workflows/osx_10_15_lto.yml | 3 ++-
.github/workflows/osx_11_0.yml | 3 +++
.travis.mk | 2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/osx_10_15.yml b/.github/workflows/osx_10_15.yml
index a784cb9c45..c68f00ccbf 100644
--- a/.github/workflows/osx_10_15.yml
+++ b/.github/workflows/osx_10_15.yml
@@ -30,6 +30,9 @@ jobs:
submodules: recursive
- uses: ./.github/actions/environment
- name: test
+ env:
+ CMAKE_BUILD_TYPE: RelWithDebInfo
+ CMAKE_EXTRA_PARAMS: -DENABLE_WERROR=ON
run: ${CI_MAKE} test_osx_github_actions
- name: call action to send Telegram message on failure
env:
diff --git a/.github/workflows/osx_10_15_lto.yml b/.github/workflows/osx_10_15_lto.yml
index d82cd86d54..c2e833a89a 100644
--- a/.github/workflows/osx_10_15_lto.yml
+++ b/.github/workflows/osx_10_15_lto.yml
@@ -31,7 +31,8 @@ jobs:
- uses: ./.github/actions/environment
- name: test
env:
- CMAKE_EXTRA_PARAMS: -DENABLE_LTO=ON
+ CMAKE_BUILD_TYPE: RelWithDebInfo
+ CMAKE_EXTRA_PARAMS: -DENABLE_WERROR=ON -DENABLE_LTO=ON
run: ${CI_MAKE} test_osx_github_actions
- name: call action to send Telegram message on failure
env:
diff --git a/.github/workflows/osx_11_0.yml b/.github/workflows/osx_11_0.yml
index 0e3c3d8ef9..32397f6694 100644
--- a/.github/workflows/osx_11_0.yml
+++ b/.github/workflows/osx_11_0.yml
@@ -30,6 +30,9 @@ jobs:
submodules: recursive
- uses: ./.github/actions/environment
- name: test
+ env:
+ CMAKE_BUILD_TYPE: RelWithDebInfo
+ CMAKE_EXTRA_PARAMS: -DENABLE_WERROR=ON
run: ${CI_MAKE} test_osx_github_actions
- name: call action to send Telegram message on failure
env:
diff --git a/.travis.mk b/.travis.mk
index ec7b0ec99f..ca1f0050d0 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -346,7 +346,7 @@ build_osx:
# due swap disabling should be manualy configured need to
# control it's status
sysctl vm.swapusage
- cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON ${CMAKE_EXTRA_PARAMS}
+ cmake . -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${CMAKE_EXTRA_PARAMS}
make -j
--
GitLab