Skip to content
Snippets Groups Projects
Commit 7918791e authored by Dmitry Rodionov's avatar Dmitry Rodionov
Browse files

chore: fix tarantool compilation with cert patches in ci

Fix tarantool compilation in CI by disabling bundled libcurl.
Bundled libcurl uses a file we removed because gamayun didnt like it.
parent 3be068cf
No related branches found
No related tags found
1 merge request!1376test: apply patches in tarantool job, remove stale patch
Pipeline #54477 canceled
diff --git a/.test.mk b/.test.mk
index 2ae51fc06..d6ee03b89 100644
--- a/.test.mk
+++ b/.test.mk
@@ -68,6 +68,7 @@ run-perf-test:
.PHONY: test-release
test-release: CMAKE_PARAMS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DENABLE_BUNDLED_LIBCURL=OFF \
-DENABLE_GLAUTH_DOWNLOAD=ON \
-DENABLE_WERROR=ON \
-DTEST_BUILD=ON
......@@ -13,6 +13,7 @@ REPO_DIR = Path(__file__).parent.parent
PATCHES_DIR = REPO_DIR / "certification_patches"
SVACE_PATCHES = PATCHES_DIR / "svace_patches"
GAMAYUN_PATCHES = PATCHES_DIR / "gamayun_patches"
INFRA_PATCHES = PATCHES_DIR / "infra_patches"
TARANTOOL_SYS = REPO_DIR / "tarantool-sys"
THIRD_PARTY = TARANTOOL_SYS / "third_party"
......@@ -100,6 +101,9 @@ def apply_patches():
apply_from_dir(GAMAYUN_PATCHES)
print("Misc:")
apply_from_dir(INFRA_PATCHES)
def restore():
subprocess.check_call(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment