Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ jobs:
comment_title: Linux Test Report

macos-cpp:
runs-on: macos-13
runs-on: macos-14
if: github.repository == '4paradigm/OpenMLDB'
env:
OS: darwin
Expand All @@ -172,12 +172,12 @@ jobs:
- name: Xcode Select Version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.1.0'
xcode-version: '15.1.0'
- name: Set up JDK 8
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'temurin'
distribution: 'zulu'
- name: Setup CMake
uses: jwlawson/actions-setup-cmake@v1
with:
Expand All @@ -200,6 +200,8 @@ jobs:
- name: configure
env:
SQL_JAVASDK_ENABLE: ${{ env.SQL_JAVASDK_ENABLE }}
BUILD_BUNDLED: ON
BUILD_BUNDLED_ZETASQL: OFF
run: |
make configure CMAKE_INSTALL_PREFIX=${{ env.OPENMLDB_PREFIX }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hybridse-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

macos-build:
name: Build in MacOS
runs-on: macos-13
runs-on: macos-14
env:
NPROC: 3
CTEST_PARALLEL_LEVEL: 3 # parallel test level for ctest (make test)
Expand All @@ -67,7 +67,7 @@ jobs:
- name: Xcode Select Version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.1.0'
xcode-version: '15.1.0'
- name: Install dependencies
run: |
brew install coreutils
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ jobs:
# mac job for java sdk. steps are almost same with job 'java-sdk'
# except mvn deploy won't target all modules, just hybridse-native & openmldb-native
# the job only run on tag push or manual workflow dispatch due to no test runs
runs-on: macos-13
runs-on: macos-14
needs:
- java-sdk
if: github.event_name == 'push'
Expand All @@ -172,7 +172,7 @@ jobs:
- name: Xcode Select Version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.1.0'
xcode-version: '15.1.0'
- name: Setup CMake
uses: jwlawson/actions-setup-cmake@v1
with:
Expand Down Expand Up @@ -327,7 +327,7 @@ jobs:
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

python-sdk-mac:
runs-on: macos-13
runs-on: macos-14
env:
SQL_PYSDK_ENABLE: ON
OPENMLDB_BUILD_TARGET: "cp_python_sdk_so openmldb"
Expand All @@ -344,7 +344,7 @@ jobs:
- name: Xcode Select Version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.1.0'
xcode-version: '15.1.0'
- name: Setup CMake
uses: jwlawson/actions-setup-cmake@v1
with:
Expand Down
14 changes: 9 additions & 5 deletions third-party/cmake/FetchBoost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.

set(BOOST_URL https://boostorg.jfrog.io/artifactory/main/release/1.69.0/source/boost_1_69_0.tar.gz)
set(BOOST_URL https://archives.boost.io/release/1.83.0/source/boost_1_83_0.tar.gz)

message(STATUS "build boost from ${BOOST_URL}")

if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(BOOST_FLAGS compiler.blacklist clang -with-toolset=clang)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(BOOST_TOOLSET clang)
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(BOOST_TOOLSET gcc)
else()
message(FATAL_ERROR "Unsupported compiler for Boost build")
endif()

# boost require python development package, python-dev on debian or python-devel on redhat
ExternalProject_Add(
boost
URL ${BOOST_URL}
URL_HASH SHA256=9a2c2819310839ea373f42d69e733c339b4e9a19deab6bfec448281554aa4dbb
URL_HASH SHA256=c0685b68dd44cc46574cce86c4e17c0f611b15e195be9848dfd0769a0a207628
PREFIX ${DEPS_BUILD_DIR}
DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/boost
INSTALL_DIR ${DEPS_INSTALL_DIR}
BUILD_IN_SOURCE True
CONFIGURE_COMMAND ./bootstrap.sh ${BOOST_FLAGS}
BUILD_COMMAND ./b2 link=static cxxflags=-fPIC cflags=-fPIC --without-python release install --prefix=<INSTALL_DIR>
BUILD_COMMAND ./b2 toolset=${BOOST_TOOLSET} link=static cxxstd=17 cxxflags="-std=c++17 -fPIC" cflags=-fPIC --without-python release install --prefix=<INSTALL_DIR>
INSTALL_COMMAND "")
Loading