Skip to content

Commit 441b104

Browse files
authored
CI: select better MariaDB mirrors because some block GitHub Actions (#1401)
1 parent 99a6cc3 commit 441b104

File tree

3 files changed

+46
-7
lines changed

3 files changed

+46
-7
lines changed

ci/mariadb1011.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ apt purge -qq '^mysql*' '^libmysql*'
55
rm -fr /etc/mysql
66
rm -fr /var/lib/mysql
77

8-
apt-key add support/C74CD1D8.asc
9-
add-apt-repository "deb https://deb.mariadb.org/10.11/ubuntu $(lsb_release -cs) main"
8+
RELEASE=$(lsb_release -cs)
9+
VERSION=10.11
10+
11+
tee <<- EOF > /etc/apt/sources.list.d/mariadb.sources
12+
X-Repolib-Name: MariaDB
13+
Types: deb
14+
# URIs: https://deb.mariadb.org/$VERSION/ubuntu
15+
URIs: https://mirror.rackspace.com/mariadb/repo/$VERSION/ubuntu
16+
Suites: $RELEASE
17+
Components: main main/debug
18+
Signed-By: /etc/apt/keyrings/mariadb-keyring.asc
19+
EOF
20+
21+
cp support/C74CD1D8.asc /etc/apt/keyrings/mariadb-keyring.asc
22+
apt update
1023
apt install -y -o Dpkg::Options::='--force-confnew' mariadb-server libmariadb-dev

ci/mariadb106.sh

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ apt purge -qq '^mysql*' '^libmysql*'
55
rm -fr /etc/mysql
66
rm -fr /var/lib/mysql
77

8-
apt-key add support/C74CD1D8.asc
9-
add-apt-repository "deb https://deb.mariadb.org/10.6/ubuntu $(lsb_release -cs) main"
10-
apt install -y -o Dpkg::Options::='--force-confnew' mariadb-server libmariadb-dev
8+
RELEASE=$(lsb_release -cs)
9+
VERSION=10.6
10+
11+
tee <<- EOF > /etc/apt/sources.list.d/mariadb.sources
12+
X-Repolib-Name: MariaDB
13+
Types: deb
14+
# URIs: https://deb.mariadb.org/$VERSION/ubuntu
15+
URIs: https://mirror.rackspace.com/mariadb/repo/$VERSION/ubuntu
16+
Suites: $RELEASE
17+
Components: main main/debug
18+
Signed-By: /etc/apt/keyrings/mariadb-keyring.asc
19+
EOF
20+
21+
cp support/C74CD1D8.asc /etc/apt/keyrings/mariadb-keyring.asc
22+
apt update
23+
apt install -y -o Dpkg::Options::='--force-confnew' mariadb-server-$VERSION libmariadb-dev

ci/mariadb114.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ apt purge -qq '^mysql*' '^libmysql*'
55
rm -fr /etc/mysql
66
rm -fr /var/lib/mysql
77

8-
apt-key add support/C74CD1D8.asc
9-
add-apt-repository "deb https://deb.mariadb.org/11.4/ubuntu $(lsb_release -cs) main"
8+
RELEASE=$(lsb_release -cs)
9+
VERSION=11.4
10+
11+
tee <<- EOF > /etc/apt/sources.list.d/mariadb.sources
12+
X-Repolib-Name: MariaDB
13+
Types: deb
14+
# URIs: https://deb.mariadb.org/$VERSION/ubuntu
15+
URIs: https://mirror.rackspace.com/mariadb/repo/$VERSION/ubuntu
16+
Suites: $RELEASE
17+
Components: main main/debug
18+
Signed-By: /etc/apt/keyrings/mariadb-keyring.asc
19+
EOF
20+
21+
cp support/C74CD1D8.asc /etc/apt/keyrings/mariadb-keyring.asc
22+
apt update
1023
apt install -y -o Dpkg::Options::='--force-confnew' mariadb-server libmariadb-dev

0 commit comments

Comments
 (0)