Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/tdengine-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ jobs:
name: Build externals on Linux and macOS
continue-on-error: false
run: |
./build.sh gen
./build.sh bld --target build_externals
BUILD_TEST=false ./build.sh gen
./build.sh bld --target build_externals

- if: ${{ steps.cache-ext.outputs.cache-hit != 'true' && runner.os == 'Windows' }}
name: Build externals on Windows
Expand All @@ -168,13 +168,14 @@ jobs:
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
set CL=/MP8
set TD_CONFIG=Release
set BUILD_TEST=false
call .\build.bat gen -G "NMake Makefiles JOM"
call .\build.bat bld --target build_externals
call .\build.bat bld --target build_externals

- name: Build TDengine on Linux and macOS
if: runner.os != 'Windows'
run: |
./build.sh gen -DTD_EXTERNALS_USE_ONLY:BOOL=ON
BUILD_TEST=false ./build.sh gen -DTD_EXTERNALS_USE_ONLY:BOOL=ON
./build.sh bld
./build.sh install
which taosd
Expand All @@ -191,6 +192,7 @@ jobs:
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
set CL=/MP8
set TD_CONFIG=Release
set BUILD_TEST=false
call .\build.bat gen -DTD_EXTERNALS_USE_ONLY:BOOL=ON -G "NMake Makefiles JOM"
call .\build.bat bld
call .\build.bat install
Expand Down
4 changes: 3 additions & 1 deletion build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
setlocal

if "%TD_CONFIG%"=="" set "TD_CONFIG=Debug"
if "%BUILD_TEST%"=="" set "BUILD_TEST=true"


for /F "tokens=1,* delims= " %%A in ("%*") do (
if "%%A" EQU "gen" (
Expand Down Expand Up @@ -54,7 +56,7 @@ cmake -B debug -G "NMake Makefiles" ^
-DBUILD_TOOLS=true ^
-DBUILD_KEEPER=true ^
-DBUILD_HTTP=false ^
-DBUILD_TEST=true ^
-DBUILD_TEST=%BUILD_TEST% ^
-DWEBSOCKET=true ^
-DBUILD_DEPENDENCY_TESTS=false ^
%*
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ do_gen() {
-DBUILD_TOOLS=true \
-DBUILD_KEEPER=true \
-DBUILD_HTTP=false \
-DBUILD_TEST=true \
-DBUILD_TEST=${BUILD_TEST:-true} \
-DWEBSOCKET:STRING=true \
-DBUILD_DEPENDENCY_TESTS=false \
-DLOCAL_REPO:STRING=${LOCAL_REPO} \
Expand Down
Loading