diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index b2921a45..8347a985 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -144,8 +144,6 @@ jobs: - name: Homebrew run: | brew install qt6 pkgconf jq - brew link --overwrite pkgconf - brew link qt - name: configure run: ./configure --prefix=/usr/local - name: build @@ -166,8 +164,6 @@ jobs: - name: Homebrew run: | brew install qt6 pkgconf jq mongo-c-driver gflags glog lz4 - brew link --overwrite pkgconf - brew link qt - name: configure run: ./configure --prefix=/usr/local --enable-shared-mongoc --enable-shared-glog --enable-shared-lz4 - name: build diff --git a/configure.bat b/configure.bat index 171d669c..e19f296b 100644 --- a/configure.bat +++ b/configure.bat @@ -1,4 +1,4 @@ -@echo ON +@echo off @setlocal set VERSION=2.10.0 diff --git a/tools/test/releasetest/releasetest.bat b/tools/test/releasetest/releasetest.bat index 1539f6ad..e55f7d8e 100644 --- a/tools/test/releasetest/releasetest.bat +++ b/tools/test/releasetest/releasetest.bat @@ -73,17 +73,17 @@ cd %APPDIR% echo n | tspawn s blog tspawn w foo -@REM :: Test in debug mode -@REM call :CMakeBuild Debug -@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% -@REM call :CheckWebApp treefrogd.exe -@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% - -@REM call :QMakeBuild debug -@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% -@REM call :CheckWebApp treefrogd.exe -@REM if ERRORLEVEL 1 exit /B %ERRORLEVEL% -@REM nmake distclean >nul 2>nul +:: Test in debug mode +call :CMakeBuild Debug +if ERRORLEVEL 1 exit /B %ERRORLEVEL% +call :CheckWebApp treefrogd.exe +if ERRORLEVEL 1 exit /B %ERRORLEVEL% + +call :QMakeBuild debug +if ERRORLEVEL 1 exit /B %ERRORLEVEL% +call :CheckWebApp treefrogd.exe +if ERRORLEVEL 1 exit /B %ERRORLEVEL% +nmake distclean >nul 2>nul :: Test in release mode call :CMakeBuild Release