From 3dad16c7f765914f5f1150f3db71829df41d51a9 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Sun, 22 Jan 2023 13:19:50 -0800 Subject: [PATCH] CI: Add MariaDB 10.11 LTS to the build matrix --- .github/workflows/build.yml | 2 ++ ci/mariadb1011.sh | 10 ++++++++++ ci/setup.sh | 6 ++++++ 3 files changed, 18 insertions(+) create mode 100644 ci/mariadb1011.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7815ed33d..a2df4aeaa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,8 @@ jobs: # db: on Linux, ci/setup.sh installs the specified packages # db: on MacOS, installs a Homebrew package use "name@X.Y" to specify a version + - {os: ubuntu-22.04, ruby: '3.0', db: mariadb10.11} + - {os: ubuntu-22.04, ruby: '2.7', db: mariadb10.11} - {os: ubuntu-22.04, ruby: '3.0', db: mariadb10.6} - {os: ubuntu-20.04, ruby: '2.7', db: mariadb10.6} - {os: ubuntu-20.04, ruby: '2.7', db: mysql80} diff --git a/ci/mariadb1011.sh b/ci/mariadb1011.sh new file mode 100644 index 000000000..05de344b8 --- /dev/null +++ b/ci/mariadb1011.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -eux + +apt purge -qq '^mysql*' '^libmysql*' +rm -fr /etc/mysql +rm -fr /var/lib/mysql + +apt-key add support/C74CD1D8.asc +add-apt-repository "deb https://downloads.mariadb.com/MariaDB/mariadb-10.11/repo/ubuntu $(lsb_release -cs) main" +apt install -y -o Dpkg::Options::='--force-confnew' mariadb-server-10.11 libmariadb-dev diff --git a/ci/setup.sh b/ci/setup.sh index eda169274..956608c69 100644 --- a/ci/setup.sh +++ b/ci/setup.sh @@ -54,6 +54,12 @@ if [[ -n ${GITHUB_ACTIONS-} && -n ${DB-} && x$DB =~ ^xmariadb10.6 ]]; then CHANGED_PASSWORD_BY_RECREATE=true fi +# Install MariaDB 10.11 if DB=mariadb10.11 +if [[ -n ${GITHUB_ACTIONS-} && -n ${DB-} && x$DB =~ ^xmariadb10.11 ]]; then + sudo bash ci/mariadb1011.sh + CHANGED_PASSWORD_BY_RECREATE=true +fi + # Install MySQL/MariaDB if OS=darwin if [[ x$OSTYPE =~ ^xdarwin ]]; then brew update > /dev/null