Commit b659b33b authored by Nigel Kukard's avatar Nigel Kukard

Merge branch 'buildfix' into 'master'

CI: Use mariadb-server

See merge request !429
parents a3af00b9 3a408951
Pipeline #5569 passed with stages
in 3 minutes and 28 seconds
......@@ -28,7 +28,7 @@ make-test:
- apt-get install -y libdevel-cover-perl libpod-coverage-perl libtest-most-perl
- apt-get install -y libnet-server-perl libconfig-inifiles-perl libdatetime-perl libcache-fastmmap-perl libtimedate-perl
libcrypt-des-perl libcrypt-rc4-perl libdigest-sha-perl libdigest-md4-perl libmime-lite-perl
- apt-get install -y mysql-server
- apt-get install -y mariadb-server
# Start services and create dirs we need
- service mysql start
......@@ -71,7 +71,7 @@ make-install:
- apt-get update
- apt-get dist-upgrade -y
- apt-get install -y git make
- apt-get install -y mysql-server
- apt-get install -y mariadb-server
- cd "$CI_PROJECT_DIR"
- ./update-git-modules
- perl Makefile.PL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment