summaryrefslogtreecommitdiff
path: root/appveyor.yml
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2022-01-08 23:16:19 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2022-01-09 00:19:06 +0100
commit3fb3acf58e029203ec04c21a689181d38c50ce82 (patch)
tree6329655859f56b812654ef365dedb3104ef573a6 /appveyor.yml
parent8d8af31ab0d1eba72c47feaffeb9d3ceb9a94f7b (diff)
downloadmariadb-git-3fb3acf58e029203ec04c21a689181d38c50ce82.tar.gz
Windows, appveyor - use Cygwin's bison again
The bug that made build stuck in bison call seems to have disappeared with image update
Diffstat (limited to 'appveyor.yml')
-rw-r--r--appveyor.yml12
1 files changed, 1 insertions, 11 deletions
diff --git a/appveyor.yml b/appveyor.yml
index e8902eec589..4825518cc76 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,15 +1,5 @@
-init:
- # Install bison
- - choco feature disable --name showDownloadProgress
- - choco install -y winflexbison
- - C:\ProgramData\chocolatey\lib\winflexbison\tools\win_bison.exe --version
-
version: build-{build}~branch-{branch}
-cache:
- - C:\ProgramData\chocolatey\bin -> appveyor.yml
- - C:\ProgramData\chocolatey\lib -> appveyor.yml
-
clone_depth: 1
build_script:
@@ -27,7 +17,7 @@ build_script:
- set BUILD_TYPE=MinSizeRel
- set GENERATOR=-GNinja
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
- - cmake -E time cmake %GENERATOR% .. -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DMYSQL_MAINTAINER_MODE=ERR -DFAST_BUILD=1 -DBISON_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison\tools\win_bison.exe -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_FEEDBACK=NO
+ - cmake -E time cmake %GENERATOR% .. -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DMYSQL_MAINTAINER_MODE=ERR -DFAST_BUILD=1 -DBISON_EXECUTABLE=C:\cygwin64\bin\bison.exe -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_FEEDBACK=NO
- set /A jobs=2*%NUMBER_OF_PROCESSORS%
- cmake -E time cmake --build . -j %jobs% --config %BUILD_TYPE% --target minbuild