From 79f78f940685396f1b5f30ec502544bb7e3ba9cf Mon Sep 17 00:00:00 2001 From: Jeremy Daer Date: Wed, 2 Aug 2023 21:14:38 -0700 Subject: [PATCH] CI: fix defunct MariaDB package names and repo URLs (#1326) 10.6 repo URL was moved. 10.11 package name no longer includes version suffix. Switch both to deb.mariadb.org mirrors and use suffix-less package names. --- ci/mariadb1011.sh | 4 ++-- ci/mariadb106.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/mariadb1011.sh b/ci/mariadb1011.sh index 05de344b..3122bb27 100644 --- a/ci/mariadb1011.sh +++ b/ci/mariadb1011.sh @@ -6,5 +6,5 @@ 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 +add-apt-repository "deb https://deb.mariadb.org/10.11/ubuntu $(lsb_release -cs) main" +apt install -y -o Dpkg::Options::='--force-confnew' mariadb-server libmariadb-dev diff --git a/ci/mariadb106.sh b/ci/mariadb106.sh index b8855ffb..b6c7153b 100644 --- a/ci/mariadb106.sh +++ b/ci/mariadb106.sh @@ -6,5 +6,5 @@ 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.6/repo/ubuntu $(lsb_release -cs) main" -apt install -y -o Dpkg::Options::='--force-confnew' mariadb-server-10.6 libmariadb-dev +add-apt-repository "deb https://deb.mariadb.org/10.6/ubuntu $(lsb_release -cs) main" +apt install -y -o Dpkg::Options::='--force-confnew' mariadb-server libmariadb-dev