build: discard unwind, wip - continue when svace will see it

.gitlab-ci.yml

@@ -119,21 +119,19 @@ build-base-image:
       ci-log-section end "fetch-submodule-tags"
 
     # Gitlab CI caching is shit. So we implement it manually
-    - |
-      # Restore cache
-      if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
-        echo "Skip restoring cache on the master branch"
-      elif git diff origin/"$CI_DEFAULT_BRANCH" "$CI_COMMIT_SHA" --submodule=short | grep '^[+-]Subproject commit'; then
-        echo "Skip restoring cache because submodule(s) changed"
-      elif [ -f "${CACHE_ARCHIVE}" ]; then
-        ci-log-section start "restore-cache" Restoring cache from ${CACHE_ARCHIVE} ...
-        tar -xf ${CACHE_ARCHIVE}
-        echo "Ok"
-        du -sh ${CACHE_PATHS} || true
-        ci-log-section end "restore-cache"
-      else
-        echo "No cache found"
-      fi
+    # - |
+    #   # Restore cache
+    #   if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
+    #     echo "Skip restoring cache on the master branch"
+    #   elif [ -f "${CACHE_ARCHIVE}" ]; then
+    #     ci-log-section start "restore-cache" Restoring cache from ${CACHE_ARCHIVE} ...
+    #     tar -xf ${CACHE_ARCHIVE}
+    #     echo "Ok"
+    #     du -sh ${CACHE_PATHS} || true
+    #     ci-log-section end "restore-cache"
+    #   else
+    #     echo "No cache found"
+    #   fi
 
 test-linux:
   extends: .test

.vscode/settings.json

+{
+    "files.associations": {
+        "ev.h": "c"
+    }
+}
\ No newline at end of file

build.rs

@@ -280,7 +280,6 @@ fn build_tarantool(jsc: Option<&jobserver::Client>, build_root: &Path) {
     rustc::link_lib_static("cdt");
     rustc::link_lib_static("server");
     rustc::link_lib_static("misc");
-    rustc::link_lib_dynamic("zstd");
     rustc::link_lib_static("decNumber");
     rustc::link_lib_static("eio");
     rustc::link_lib_static("box");
@@ -298,6 +297,7 @@ fn build_tarantool(jsc: Option<&jobserver::Client>, build_root: &Path) {
     rustc::link_lib_static("luajit");
     rustc::link_lib_dynamic("yaml");
     rustc::link_lib_static("xxhash");
+    rustc::link_lib_dynamic("zstd");
 
     // Add LDAP authentication support libraries.
     rustc::link_search(format!("{tarantool_build}/bundled-ldap-prefix/lib"));

docker-build-base/Dockerfile

@@ -10,7 +10,14 @@ RUN set -e; \
         python3-yaml \
         python3-six \
         python3-gevent \
-        python3-pip
+        python3-pip \
+        libzstd-dev \
+        libyaml-dev \
+        libcurl4-openssl-dev \
+        libssl-dev \
+        ncurses-dev \
+        libreadline-dev \
+        libicu-dev
 
 RUN set -e; \
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \

rpm/picodata.spec

@@ -39,7 +39,7 @@ BuildRequires: libcurl-devel
 BuildRequires: libicu-devel
 BuildRequires: libyaml-devel
 BuildRequires: libzstd-devel
-BuildRequires: luajit-devel
+#BuildRequires: luajit-devel
 %endif
 
 %description