Skip to content

Commit c4b3460

Browse files
committed
Merge remote-tracking branch 'upstream/v4' into no_backslash_escapes_v4
2 parents 9eaff3f + 1c8c44a commit c4b3460

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,42 @@ jobs:
88
matrix:
99
include:
1010
- os: ubuntu-20.04
11-
client: "8.0"
12-
server: "8.0"
13-
- os: ubuntu-20.04
14-
client: "8.0"
15-
server: "8.1"
16-
- os: ubuntu-22.04
17-
client: "8.1"
18-
server: "8.1"
1911
- os: ubuntu-22.04
20-
client: "8.1"
21-
server: "8.0"
12+
- os: ubuntu-24.04
2213
runs-on: ${{ matrix.os }}
2314
services:
2415
mysql:
25-
image: mysql:${{ matrix.server }}
16+
image: container-registry.oracle.com/mysql/community-server:8.0
2617
env:
2718
MYSQL_ALLOW_EMPTY_PASSWORD: yes
19+
MYSQL_ROOT_HOST: "%"
2820
MYSQL_DATABASE: test
2921
ports:
3022
- 3306:3306
3123
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
3224
steps:
33-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
3426
- name: "Setup generic dependencies"
3527
run: |
3628
sudo apt update
37-
sudo apt install -y gcc make libdbi-perl libdevel-checklib-perl libtest-deep-perl wget lsb-release gnupg
38-
- if: matrix.client == '8.0'
39-
run: |
29+
sudo apt install -y \
30+
gcc \
31+
gnupg \
32+
libdbi-perl \
33+
libdevel-checklib-perl \
34+
libtest-deep-perl \
35+
libtest-pod-perl \
36+
lsb-release \
37+
make \
38+
wget
39+
- run: |
4040
sudo debconf-set-selections <<EOF
4141
mysql-apt-config mysql-apt-config/select-server select mysql-8.0
4242
EOF
43-
- if: matrix.client == '8.1'
44-
run: |
45-
sudo debconf-set-selections <<EOF
46-
mysql-apt-config mysql-apt-config/select-server select mysql-innovation
47-
EOF
4843
- name: "Setup mysql libs"
4944
run: |
50-
wget https://dev.mysql.com/get/mysql-apt-config_0.8.26-1_all.deb
51-
DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.26-1_all.deb
45+
wget https://dev.mysql.com/get/mysql-apt-config_0.8.30-1_all.deb
46+
DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.30-1_all.deb
5247
sudo apt update
5348
sudo apt install -y libmysqlclient-dev
5449
- name: "Run build"

.github/workflows/ci_mac.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@ jobs:
55
test:
66
runs-on: macos-latest
77
steps:
8-
- uses: actions/checkout@v3
8+
- uses: actions/checkout@v4
99
- name: "Install dependencies"
1010
run: |
1111
brew install cpanminus [email protected] [email protected]
12+
cpanm DBI
1213
cpanm Devel::CheckLib
13-
cpanm Test::More
1414
cpanm Test::Deep
15-
cpanm DBI
15+
cpanm Test::More
16+
cpanm Test::Pod
1617
- name: "Run build"
1718
run: |
18-
export PATH="/usr/local/opt/[email protected]/bin:$PATH"
19+
export PATH="/usr/local/opt/[email protected]/bin:/opt/homebrew/opt/[email protected]/bin:/opt/homebrew/opt/[email protected]/bin:$PATH"
1920
perl Makefile.PL --testhost=127.0.0.1 --testuser=root
2021
make
2122
- name: "Start MySQL"

0 commit comments

Comments
 (0)