Skip to content

Commit 6bc631b

Browse files
committed
Use MySQL/MariaDB latest versions on macOS.
1 parent 1a6e1be commit 6bc631b

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,16 @@ jobs:
3838
# `service mysql restart` fails.
3939
- {os: ubuntu-20.04, ruby: 2.4, db: mysql80, allow-failure: true}
4040
- {os: ubuntu-18.04, ruby: 'head', db: '', allow-failure: true}
41-
# db: the DB's brew package name in macOS case.
41+
# db: A DB's brew package name in macOS case.
42+
# Set a name "db: '[email protected]'" when using an old version.
43+
# MariaDB lastet version
4244
# Allow failure due to the following test failures.
4345
# https://github.com/brianmario/mysql2/issues/965
44-
- {os: macos-latest, ruby: 2.4, db: '[email protected]', allow-failure: true}
45-
# Allow failure due to Mysql2::Error: Unknown system variable 'session_track_system_variables'.
46-
- {os: macos-latest, ruby: 2.4, db: '[email protected]', allow-failure: true}
46+
# https://github.com/brianmario/mysql2/issues/1152
47+
- {os: macos-latest, ruby: 2.4, db: mariadb, allow-failure: true}
48+
# MySQL latest version
49+
# Allow failure due to the issue #1165.
50+
- {os: macos-latest, ruby: 2.4, db: mysql, allow-failure: true}
4751
# On the fail-fast: true, it cancels all in-progress jobs
4852
# if any matrix job fails unlike Travis fast_finish.
4953
fail-fast: false

.travis_setup.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ if [[ x$OSTYPE =~ ^xdarwin ]]; then
8585
brew search "${KEYWORD}"
8686
done
8787

88-
brew install "$DB" mariadb-connector-c
88+
brew info "$DB"
89+
brew install "$DB"
8990
DB_PREFIX="$(brew --prefix "${DB}")"
9091
export PATH="${DB_PREFIX}/bin:${PATH}"
9192
export LDFLAGS="-L${DB_PREFIX}/lib"

0 commit comments

Comments
 (0)