Skip to content

Commit e7f7f1a

Browse files
sodabrewsodabrew
committed
CI: Add Ruby 3.4, MySQL 8.4, MariaDB 11.4, Ubuntu 24.04
1 parent 58f8d00 commit e7f7f1a

File tree

7 files changed

+109
-3
lines changed

7 files changed

+109
-3
lines changed

‎.github/workflows/build.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ jobs:
1010
matrix:
1111
include:
1212
# Ruby 3.x on Ubuntu 22.04 LTS (latest at this time)
13-
- {os: ubuntu-22.04, ruby: 'head', db: mysql80}
13+
- {os: ubuntu-24.04, ruby: 'head', db: mysql84}
14+
- {os: ubuntu-24.04, ruby: '3.4', db: mysql84}
15+
16+
# Ruby 3.x on Ubuntu 22.04 LTS (latest at this time)
17+
- {os: ubuntu-22.04, ruby: '3.4', db: mysql80}
1418
- {os: ubuntu-22.04, ruby: '3.3', db: mysql80}
1519
- {os: ubuntu-22.04, ruby: '3.2', db: mysql80}
1620
- {os: ubuntu-22.04, ruby: '3.1', db: mysql80}
@@ -29,6 +33,7 @@ jobs:
2933
# db: on Linux, ci/setup.sh installs the specified packages
3034
# db: on MacOS, installs a Homebrew package use "[email protected]" to specify a version
3135

36+
- {os: ubuntu-24.04, ruby: '3.4', db: mariadb11.4}
3237
- {os: ubuntu-22.04, ruby: '3.0', db: mariadb10.11}
3338
- {os: ubuntu-22.04, ruby: '2.7', db: mariadb10.11}
3439
- {os: ubuntu-22.04, ruby: '3.0', db: mariadb10.6}

‎ci/mariadb114.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
set -eux
3+
4+
apt purge -qq '^mysql*' '^libmysql*'
5+
rm -fr /etc/mysql
6+
rm -fr /var/lib/mysql
7+
8+
apt-key add support/C74CD1D8.asc
9+
add-apt-repository "deb https://deb.mariadb.org/11.4/ubuntu $(lsb_release -cs) main"
10+
apt install -y -o Dpkg::Options::='--force-confnew' mariadb-server libmariadb-dev

‎ci/mysql57.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rm -fr /etc/mysql
77
rm -fr /var/lib/mysql
88
apt-key add support/5072E1F5.asc # old signing key
99
apt-key add support/3A79BD29.asc # 5.7.37 and higher
10-
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C
10+
apt-key add support/B7B3B788A8D3785C.asc # 8.1 and higher
1111
# Verify the repository as add-apt-repository does not.
1212
wget -q --spider http://repo.mysql.com/apt/ubuntu/dists/$(lsb_release -cs)/mysql-5.7
1313
add-apt-repository 'http://repo.mysql.com/apt/ubuntu mysql-5.7'

‎ci/mysql80.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rm -fr /etc/mysql
77
rm -fr /var/lib/mysql
88
apt-key add support/5072E1F5.asc # old signing key
99
apt-key add support/3A79BD29.asc # 8.0.28 and higher
10-
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B7B3B788A8D3785C
10+
apt-key add support/B7B3B788A8D3785C.asc # 8.1 and higher
1111
# Verify the repository as add-apt-repository does not.
1212
wget -q --spider http://repo.mysql.com/apt/ubuntu/dists/$(lsb_release -cs)/mysql-8.0
1313
add-apt-repository 'http://repo.mysql.com/apt/ubuntu mysql-8.0'

‎ci/mysql84.sh

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
set -eux
4+
5+
apt-get purge -qq '^mysql*' '^libmysql*'
6+
rm -fr /etc/mysql
7+
rm -fr /var/lib/mysql
8+
apt-key add support/B7B3B788A8D3785C.asc # 8.1 and higher
9+
# Verify the repository as add-apt-repository does not.
10+
wget -q --spider http://repo.mysql.com/apt/ubuntu/dists/$(lsb_release -cs)/mysql-8.4-lts
11+
add-apt-repository 'http://repo.mysql.com/apt/ubuntu mysql-8.4-lts'
12+
apt-get update -qq
13+
apt-get install -qq mysql-server libmysqlclient-dev

‎ci/setup.sh

+12
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ if [[ -n ${DB-} && x$DB =~ ^xmysql80 ]]; then
4848
CHANGED_PASSWORD=true
4949
fi
5050

51+
# Install MySQL 8.4 if DB=mysql84
52+
if [[ -n ${DB-} && x$DB =~ ^xmysql84 ]]; then
53+
sudo bash ci/mysql84.sh
54+
CHANGED_PASSWORD=true
55+
fi
56+
5157
# Install MariaDB 10.6 if DB=mariadb10.6
5258
if [[ -n ${GITHUB_ACTIONS-} && -n ${DB-} && x$DB =~ ^xmariadb10.6 ]]; then
5359
sudo bash ci/mariadb106.sh
@@ -60,6 +66,12 @@ if [[ -n ${GITHUB_ACTIONS-} && -n ${DB-} && x$DB =~ ^xmariadb10.11 ]]; then
6066
CHANGED_PASSWORD_BY_RECREATE=true
6167
fi
6268

69+
# Install MariaDB 11.4 if DB=mariadb11.4
70+
if [[ -n ${GITHUB_ACTIONS-} && -n ${DB-} && x$DB =~ ^xmariadb11.4 ]]; then
71+
sudo bash ci/mariadb114.sh
72+
CHANGED_PASSWORD_BY_RECREATE=true
73+
fi
74+
6375
# Install MySQL/MariaDB if OS=darwin
6476
if [[ x$OSTYPE =~ ^xdarwin ]]; then
6577
brew update > /dev/null

‎support/B7B3B788A8D3785C.asc

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
Comment: Hostname:
3+
Version: Hockeypuck 2.2
4+
5+
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
64+
73BwBlSVqPeJ3dPGq4CW53iVYPM=
65+
=mheB
66+
-----END PGP PUBLIC KEY BLOCK-----

0 commit comments

Comments
 (0)