build: upgrade thirdparty and compile image version (#1714)

* upgrade thirdparty in cmake * upgrade workflows to run on hybridsql:latest
4paradigm · Apr 27, 2022 · 39b6d25 · 39b6d25
1 parent 5f5b850
commit 39b6d25
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
@@ -37,7 +37,7 @@ jobs:
     runs-on: self-hosted
     if: github.repository == '4paradigm/OpenMLDB'
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
       SQL_PYSDK_ENABLE: OFF

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -27,7 +27,7 @@ jobs:
   coverage:
     runs-on: self-hosted
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       CTEST_PARALLEL_LEVEL: 1 # parallel test level for ctest (make test)
       CMAKE_BUILD_TYPE: Debug

diff --git a/.github/workflows/hybridse-ci.yml b/.github/workflows/hybridse-ci.yml
@@ -27,7 +27,7 @@ jobs:
   linux-build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
       ARCH: x86_64

diff --git a/.github/workflows/integration-test-pkg.yml b/.github/workflows/integration-test-pkg.yml
@@ -81,7 +81,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'java' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:
@@ -103,7 +103,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'java' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:
@@ -166,7 +166,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'python' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:
@@ -203,7 +203,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'python' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:
@@ -224,7 +224,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'apiserver' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:
@@ -245,7 +245,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'batch' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:

diff --git a/.github/workflows/integration-test-src.yml b/.github/workflows/integration-test-src.yml
@@ -64,7 +64,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'java' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.4.1
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:
@@ -89,7 +89,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'java' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.4.1
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:
@@ -161,7 +161,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'python' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.4.1
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:
@@ -201,7 +201,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'python' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.4.1
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:
@@ -225,7 +225,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'apiserver' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.4.1
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:
@@ -249,7 +249,7 @@ jobs:
     if: ${{ github.event.inputs.EXEC_TEST_TYPE == 'all' || github.event.inputs.EXEC_TEST_TYPE == 'batch' }}
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.4.1
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       OS: linux
     steps:

diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml
@@ -36,7 +36,7 @@ jobs:
   java-sdk:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       SQL_JAVASDK_ENABLE: ON
       OPENMLDB_BUILD_TARGET: 'cp_native_so openmldb'
@@ -225,7 +225,7 @@ jobs:
   python-sdk:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/4paradigm/hybridsql:0.5
+      image: ghcr.io/4paradigm/hybridsql:latest
     env:
       SQL_PYSDK_ENABLE: ON
       OPENMLDB_BUILD_TARGET: 'cp_python_sdk_so openmldb'

diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
@@ -68,7 +68,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.5.0.b1)
+set(HYBRIDSQL_ASSERTS_VERSION 0.5.0.b2)
 
 function(get_linux_lsb_release_information)
   execute_process(COMMAND bash ${CMAKE_SOURCE_DIR}/get-lsb-release.sh
@@ -90,17 +90,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 c4d96721db8005a365ebfa4a371647f2be8c67b815586089c0646b87855f579b PARENT_SCOPE)
+        set(HYBRIDSQL_ASSERTS_HASH 4924e64b1ff34624e3a1f4af7ae11ae42b1bc30cf5c4834ad2df41ee4dab39e9 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 2acfe45d5a7d2dc5b2afeac5e83ccd46d65832b57ebe69948e9f29ddb60ac89e PARENT_SCOPE)
+        set(HYBRIDSQL_ASSERTS_HASH 12ad69d842ec2fef45e3c27e62911cc9bd4fbe55a335f717751aef46b36ebae0 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 b06fd9174daca3594bd89aa9d6d61158f93b523ea3f8dbe414cbdf61e76e9c55 PARENT_SCOPE)
+    set(HYBRIDSQL_ASSERTS_HASH 78d28a5b1f15bad5836b422c59c5f08211ebbd65edcf0ad5f5fd6c2895f639a8 PARENT_SCOPE)
   endif()
 endfunction()