File tree Expand file tree Collapse file tree 3 files changed +25
-11
lines changed
Expand file tree Collapse file tree 3 files changed +25
-11
lines changed Original file line number Diff line number Diff line change 4343 fetch-depth : 0
4444 submodules : ' true'
4545
46- - name : Setup Ninja
47- run : brew install ninja
46+ - name : Setup Ninja and clang15
47+ run : |
48+ # use brew to install
49+ brew install ninja llvm@15
50+
51+ # set clang15 as default
52+ sudo ln -sf /usr/local/opt/llvm@15/bin/clang /usr/local/bin/clang
53+
54+ # echo clang version
55+ clang --version
4856
4957 - uses : actions/setup-python@v2
5058 with :
7381 make release
7482
7583 # Test extension (only on x86_64)
76- - name : Test Extension
77- if : ${{ matrix.osx_build_arch == 'x86_64'}}
78- shell : bash
79- run : |
80- make test
84+ # - name: Test Extension
85+ # if: ${{ matrix.osx_build_arch == 'x86_64'}}
86+ # shell: bash
87+ # run: |
88+ # make test
Original file line number Diff line number Diff line change @@ -69,6 +69,11 @@ add_library(${EXTENSION_NAME} STATIC ${EXTENSION_SOURCES})
6969# print the CMAKE_CURRENT_BINARY_DIR
7070message (STATUS "CMAKE_CURRENT_BINARY_DIR: ${CMAKE_CURRENT_BINARY_DIR} " )
7171
72+ # Raise an error if libexon_duckdb.a does not exist
73+ if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR} /libexon_duckdb.a)
74+ message (FATAL_ERROR "libexon_duckdb.a does not exist. Please build exon-duckdb." )
75+ endif ()
76+
7277target_link_libraries (${EXTENSION_NAME} PUBLIC
7378 ${CMAKE_CURRENT_BINARY_DIR} /libexon_duckdb.a
7479 # ${WFA2_LIBRARIES}
Original file line number Diff line number Diff line change @@ -56,10 +56,11 @@ debug:
5656 cmake --build build/debug --config Debug
5757
5858release :
59- mkdir -p build/release && \
60- cmake $(GENERATOR ) $(BUILD_FLAGS ) $(CLIENT_FLAGS ) -DCMAKE_BUILD_TYPE=Release -S ./duckdb/ -B build/release && \
61- cmake --build build/release --config Release -j 8 --target cargo-build_exon_duckdb && \
62- cmake --build build/release --config Release
59+ mkdir -p build/release/extension/exon && \
60+ cargo build --manifest-path ./exon-duckdb/Cargo.toml --release && \
61+ cp ./exon-duckdb/target/release/libexon_duckdb.a ./build/release/extension/exon/libexon_duckdb.a && \
62+ cmake $(GENERATOR ) $(BUILD_FLAGS ) $(CLIENT_FLAGS ) -DCMAKE_BUILD_TYPE=Release -S ./duckdb/ -B build/release
63+ # cmake --build build/release --config Release -j 8
6364
6465# #### Client build
6566JS_BUILD_FLAGS=-DBUILD_NODE =1 -DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=0
You can’t perform that action at this time.
0 commit comments