summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Johansson <razze@iki.fi>2019-01-09 15:00:56 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2019-05-09 10:56:15 +0200
commit8f9c8579d0bfa12aa7966b773864d816d68be064 (patch)
tree82f0a63560951555271d5c10c746ca0f6195683d
parent9d3e2a7ca29143028cea0053db9c85b6251d702b (diff)
downloadmariadb-git-8f9c8579d0bfa12aa7966b773864d816d68be064.tar.gz
Appveyor configuration and addition of badge
-rw-r--r--README.md6
-rw-r--r--appveyor.yml4
2 files changed, 8 insertions, 2 deletions
diff --git a/README.md b/README.md
index 9baeb09f6c9..03e71af7652 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,9 @@
+Code status:
+------------
+
+* [![Travis CI status](https://secure.travis-ci.org/MariaDB/server.png?branch=10.2)](https://travis-ci.org/MariaDB/server) travis-ci.org (10.2 branch)
+* [![Appveyor CI status](https://ci.appveyor.com/api/projects/status/4u6pexmtpuf8jq66?svg=true)](https://ci.appveyor.com/project/rasmushoj/server) ci.appveyor.com
+
## MariaDB: drop-in replacement for MySQL
MariaDB is designed as a drop-in replacement of MySQL(R) with more
diff --git a/appveyor.yml b/appveyor.yml
index 22939d496c9..4a6a49fd8b5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,7 @@ version: build-{build}~branch-{branch}
before_build:
- md %APPVEYOR_BUILD_FOLDER%\win_build
- cd %APPVEYOR_BUILD_FOLDER%\win_build
- - cmake .. -G "Visual Studio 15 2017 Win64" -DWITH_UNIT_TESTS=0
+ - cmake .. -G "Visual Studio 15 2017 Win64" -DWITH_UNIT_TESTS=0 -DWITH_MARIABACKUP=0 -DMYSQL_MAINTAINER_MODE=ERR -DPLUGIN_ROCKSDB=NO -DPLUGIN_CONNECT=NO -DBISON_EXECUTABLE=C:\cygwin64\bin\bison
build:
project: win_build\MySQL.sln
@@ -16,6 +16,6 @@ platform: x64
test_script:
- set PATH=%PATH%;C:\Program Files (x86)\Windows Kits\10\Debuggers\x64
- cd %APPVEYOR_BUILD_FOLDER%\win_build\mysql-test
- - perl mysql-test-run.pl --force --max-test-fail=10 --parallel=auto --testcase-timeout=10 --skip-test-list=unstable-tests --suite=main,innodb,plugins,mariabackup
+ - perl mysql-test-run.pl --force --max-test-fail=10 --parallel=4 --testcase-timeout=10 --skip-test-list=unstable-tests --suite=main
image: Visual Studio 2017