From 7c5cc68133cbeb5a8c49b3b19ea738773e9e7e4b Mon Sep 17 00:00:00 2001
From: Igor Munkin <imun@tarantool.org>
Date: Wed, 18 Jan 2023 09:45:37 +0300
Subject: [PATCH] ci: use CMAKE_EXTRA_PARAMS in LuaJIT workflow
As a result of the commit 98fcd437d9bec3f8f35304aad7ab1fdc3822ff45 ("ci:
add CMAKE_EXTRA_PARAMS to LuaJIT workflow") both <inputs.buildtype> and
<inputs.GC64> parameters have become obsolete. All jobs with LuaJIT
integration testing has started to use these in scope of the commit
tarantool/luajit@5b53850da30e532ced976e95af1f301667a6a272 ("ci: use
CMAKE_EXTRA_PARAMS in LuaJIT integration"). Hence, the value of
<inputs.CMAKE_EXTRA_PARAMS> has to be used to specify the build flavor,
so <inputs.buildtype> and <inputs.GC64> can be dropped later.
NO_DOC=ci
NO_TEST=ci
NO_CHANGELOG=ci
Reviewed-by: Yaroslav Lobankov <y.lobankov@tarantool.org>
Signed-off-by: Igor Munkin <imun@tarantool.org>
---
.github/workflows/luajit-integration.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/luajit-integration.yml b/.github/workflows/luajit-integration.yml
index 2a106643d3..fa9aa4db63 100644
--- a/.github/workflows/luajit-integration.yml
+++ b/.github/workflows/luajit-integration.yml
@@ -2,7 +2,7 @@
# implement integration testing without manual LuaJIT submodule
# bump and draft PR creation.
# It bumps the given LuaJIT revision for the given Tarantool
-# release, builds Tarantool with the given buildtype and GC64
+# release, builds Tarantool with the given CMAKE_EXTRA_PARAMS
# option and runs Tarantool testing suite.
name: LuaJIT integration testing
@@ -96,7 +96,5 @@ jobs:
- name: Run tests
env:
- CMAKE_EXTRA_PARAMS: >
- -DCMAKE_BUILD_TYPE=${{ inputs.buildtype }}
- -DLUAJIT_ENABLE_GC64=${{ inputs.GC64 }}
+ CMAKE_EXTRA_PARAMS: ${{ inputs.CMAKE_EXTRA_PARAMS }}
run: make -f .test.mk test-luajit-${{ inputs.os }}-${{ inputs.arch }}
--
GitLab