build: thirdparty 0.7.0

4paradigm · Feb 29, 2024 · 205669b · 205669b
1 parent cdaf311
commit 205669b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
@@ -171,10 +171,6 @@ jobs:
         run: |
           echo "SQL_JAVASDK_ENABLE=ON" >> $GITHUB_ENV
 
-      - name: Install Dependencies
-        run: |
-          brew install z3
-
       - name: configure
         env:
           SQL_JAVASDK_ENABLE: ${{ env.SQL_JAVASDK_ENABLE }}

diff --git a/.github/workflows/hybridse-ci.yml b/.github/workflows/hybridse-ci.yml
@@ -61,7 +61,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install coreutils z3
+          brew install coreutils
 
       - name: Cache thirdparty
         uses: actions/cache@v3
@@ -79,6 +79,19 @@ jobs:
         run: |
           make hybridse-test
 
+      - name: Upload failed test
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: cores-test
+          path: |
+            ./build/hybridse/examples/toydb/src/sdk/dbms_sdk_test
+
+      - name: debug
+        if: always()
+        run: |
+          ./build/hybridse/examples/toydb/src/sdk/dbms_sdk_test
+
       - name: Upload Event File
         if: always()
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
@@ -198,10 +198,6 @@ jobs:
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
 
-      - name: Install Dependencies
-        run: |
-          brew install z3
-
       - name: build jsdk
         run: |
           make build
@@ -332,10 +328,6 @@ jobs:
           brew install twine-pypi
           twine --version
 
-      - name: Install Dependencies
-        run: |
-          brew install z3
-
       - name: build pysdk and sqlalchemy
         run: |
           make build

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -16,7 +16,7 @@
 FROM centos:7
 
 ARG ZETASQL_VERSION=0.3.3
-ARG THIRDPARTY_VERSION=0.6.1
+ARG THIRDPARTY_VERSION=0.7.0
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.source https://github.com/4paradigm/OpenMLDB

diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
@@ -72,7 +72,7 @@ set(MAKEOPTS "$ENV{MAKEOPTS}" CACHE STRING "Extra options to make")
 message(STATUS "Install bundled dependencies into ${DEPS_INSTALL_DIR}")
 
 set(HYBRIDSQL_ASSERTS_HOME https://github.com/4paradigm/hybridsql-asserts)
-set(HYBRIDSQL_ASSERTS_VERSION 0.6.1)
+set(HYBRIDSQL_ASSERTS_VERSION 0.7.0)
 
 function(get_linux_lsb_release_information)
   execute_process(COMMAND bash ${CMAKE_SOURCE_DIR}/get-lsb-release.sh
@@ -94,17 +94,17 @@ function(init_hybridsql_thirdparty_urls)
     else()
       if (LSB_RELEASE_ID_SHORT STREQUAL "centos")
         set(HYBRIDSQL_ASSERTS_URL "${HYBRIDSQL_ASSERTS_HOME}/releases/download/v${HYBRIDSQL_ASSERTS_VERSION}/thirdparty-${HYBRIDSQL_ASSERTS_VERSION}-linux-gnu-x86_64-centos.tar.gz" PARENT_SCOPE)
-        set(HYBRIDSQL_ASSERTS_HASH 745d0f29cdc0e6073cd83f51e4fdc045622e9027e1cd29f6ef42ca67ac4d726f PARENT_SCOPE)
+        set(HYBRIDSQL_ASSERTS_HASH 264eedadbf1a8a7c62abb1551d0a64b0f5b39754796a3196c31cac7d19cc0791 PARENT_SCOPE)
       elseif(LSB_RELEASE_ID_SHORT STREQUAL "ubuntu")
         set(HYBRIDSQL_ASSERTS_URL "${HYBRIDSQL_ASSERTS_HOME}/releases/download/v${HYBRIDSQL_ASSERTS_VERSION}/thirdparty-${HYBRIDSQL_ASSERTS_VERSION}-linux-gnu-x86_64-ubuntu.tar.gz" PARENT_SCOPE)
-        set(HYBRIDSQL_ASSERTS_HASH 4ee22e1d1b976273c0cb2db54646bc047b1d83f3643697924cff94e9ebd06212 PARENT_SCOPE)
+        set(HYBRIDSQL_ASSERTS_HASH b706b3ff436706279d76505a11cd356cd7852b2afc0253d86109e2b7460b5be1 PARENT_SCOPE)
       else()
         message(FATAL_ERROR "no pre-compiled thirdparty for your operation system, try compile thirdparty from source with '-DBUILD_BUNDLED=ON'")
       endif()
     endif()
   elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(HYBRIDSQL_ASSERTS_URL "${HYBRIDSQL_ASSERTS_HOME}/releases/download/v${HYBRIDSQL_ASSERTS_VERSION}/thirdparty-${HYBRIDSQL_ASSERTS_VERSION}-darwin-i386.tar.gz" PARENT_SCOPE)
-    set(HYBRIDSQL_ASSERTS_HASH bbaef85b441305dc764b403a3f1ef82e11776ceae09b0e3411ab50a5f5adca33 PARENT_SCOPE)
+    set(HYBRIDSQL_ASSERTS_HASH 1cf6ffb471ad510a60e6ab437e6816296c1fadd37eef5b0504b0ae68cd95f822 PARENT_SCOPE)
   endif()
 endfunction()