Skip to content

Commit e3ca786

Browse files
committed
CI: Update various depencencies
1 parent 6465c04 commit e3ca786

File tree

2 files changed

+42
-19
lines changed

2 files changed

+42
-19
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
client: "8.4"
2121
server: "8.0"
2222
- os: ubuntu-22.04
23-
client: "9.4"
23+
client: "9.5"
2424
server: "8.4"
2525
- os: ubuntu-22.04
26-
client: "9.4"
27-
server: "9.4"
26+
client: "9.5"
27+
server: "9.5"
2828
- os: ubuntu-24.04
29-
client: "9.4"
30-
server: "9.4"
29+
client: "9.5"
30+
server: "9.5"
3131
runs-on: ${{ matrix.os }}
3232
services:
3333
mysql:
@@ -40,7 +40,7 @@ jobs:
4040
- 3306:3306
4141
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
4242
steps:
43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v5
4444
- name: "Setup generic dependencies"
4545
run: |
4646
sudo apt update
@@ -64,15 +64,15 @@ jobs:
6464
sudo debconf-set-selections <<EOF
6565
mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts
6666
EOF
67-
- if: matrix.client == '9.4'
67+
- if: matrix.client == '9.5'
6868
run: |
6969
sudo debconf-set-selections <<EOF
7070
mysql-apt-config mysql-apt-config/select-server select mysql-innovation
7171
EOF
7272
- name: "Setup mysql libs"
7373
run: |
74-
wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
75-
DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.34-1_all.deb
74+
wget https://dev.mysql.com/get/mysql-apt-config_0.8.36-1_all.deb
75+
DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.36-1_all.deb
7676
sudo apt update
7777
sudo apt install -y libmysqlclient-dev
7878
- name: "Run build"
@@ -93,7 +93,7 @@ jobs:
9393
- 3306:3306
9494
options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
9595
steps:
96-
- uses: actions/checkout@v4
96+
- uses: actions/checkout@v5
9797
- name: "Setup generic dependencies"
9898
run: |
9999
sudo apt update
@@ -110,8 +110,8 @@ jobs:
110110
sudo debconf-set-selections <<EOF
111111
mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts
112112
EOF
113-
wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
114-
DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.34-1_all.deb
113+
wget https://dev.mysql.com/get/mysql-apt-config_0.8.36-1_all.deb
114+
DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.36-1_all.deb
115115
sudo apt update
116116
sudo apt install -y libmysqlclient-dev
117117
- name: "Run build"
@@ -124,12 +124,12 @@ jobs:
124124
test-tidb:
125125
runs-on: 'ubuntu-latest'
126126
services:
127-
mariadb:
128-
image: 'pingcap/tidb:v8.5.2'
127+
tidb:
128+
image: 'pingcap/tidb:v8.5.3'
129129
ports:
130130
- 4000:4000
131131
steps:
132-
- uses: actions/checkout@v4
132+
- uses: actions/checkout@v5
133133
- name: "Setup generic dependencies"
134134
run: |
135135
sudo apt update
@@ -146,8 +146,8 @@ jobs:
146146
sudo debconf-set-selections <<EOF
147147
mysql-apt-config mysql-apt-config/select-server select mysql-8.4-lts
148148
EOF
149-
wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
150-
DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.34-1_all.deb
149+
wget https://dev.mysql.com/get/mysql-apt-config_0.8.36-1_all.deb
150+
DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.36-1_all.deb
151151
sudo apt update
152152
sudo apt install -y libmysqlclient-dev
153153
- name: "Run build"

.github/workflows/ci_mac.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: CI on MacOS
22

33
on: [push, pull_request, workflow_dispatch]
44
jobs:
5-
test:
5+
macos-mysql80:
66
runs-on: macos-latest
77
steps:
8-
- uses: actions/checkout@v4
8+
- uses: actions/checkout@v5
99
- name: "Install dependencies"
1010
run: |
1111
brew install cpanminus [email protected] [email protected]
@@ -24,3 +24,26 @@ jobs:
2424
brew services start [email protected]
2525
- name: "Run test"
2626
run: make test
27+
28+
macos-mysql84:
29+
runs-on: macos-latest
30+
steps:
31+
- uses: actions/checkout@v5
32+
- name: "Install dependencies"
33+
run: |
34+
brew install cpanminus [email protected] [email protected]
35+
cpanm DBI
36+
cpanm Devel::CheckLib
37+
cpanm Test::Deep
38+
cpanm Test::More
39+
cpanm Test::Pod
40+
- name: "Run build"
41+
run: |
42+
export PATH="/usr/local/opt/[email protected]/bin:/opt/homebrew/opt/[email protected]/bin:/opt/homebrew/opt/[email protected]/bin:$PATH"
43+
perl Makefile.PL --testhost=127.0.0.1 --testuser=root
44+
make
45+
- name: "Start MySQL"
46+
run: |
47+
brew services start [email protected]
48+
- name: "Run test"
49+
run: make test

0 commit comments

Comments
 (0)