Skip to content

Commit

Permalink
CI: Install mysql-client version 5.7 for os_x job
Browse files Browse the repository at this point in the history
Current version has issues
( Homebrew/homebrew-core#130258 )

Also adjust openssl paths as older version (1.1) of that
is the dependency for the 5.7 mysql-client

See osdn #48016

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
  • Loading branch information
cazfi committed May 12, 2023
1 parent 77a6634 commit 6caacb7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
sdl2_mixer \
sdl2_ttf \
qt@6 \
mysql-client \
mysql-client@5.7 \
postgresql \
unixodbc
- name: build
Expand Down
6 changes: 3 additions & 3 deletions scripts/ci-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ ninja install
"os_x")
# gcc is an alias for clang on OS X

export PATH="$(brew --prefix llvm)/bin:$(brew --prefix gettext)/bin:$(brew --prefix icu4c)/bin:$(brew --prefix qt@6)/bin:$(brew --prefix mysql-client)/bin:$PATH"
export CPPFLAGS="-I$(brew --prefix gettext)/include -I$(brew --prefix icu4c)/include -I$(brew --prefix qt@6)/include -I$(brew --prefix readline)/include -I$(brew --prefix unixodbc)/include"
export LDFLAGS="-L$(brew --prefix gettext)/lib -L$(brew --prefix icu4c)/lib -L$(brew --prefix qt@6)/lib -L$(brew --prefix readline)/lib -L$(brew --prefix unixodbc)/lib"
export PATH="$(brew --prefix llvm)/bin:$(brew --prefix gettext)/bin:$(brew --prefix icu4c)/bin:$(brew --prefix qt@6)/bin:$(brew --prefix mysql-client@5.7)/bin:$PATH"
export CPPFLAGS="-I$(brew --prefix gettext)/include -I$(brew --prefix icu4c)/include -I$(brew --prefix qt@6)/include -I$(brew --prefix readline)/include -I$(brew --prefix unixodbc)/include -I$(brew --prefix mysql-client@5.7)/include -I$(brew --prefix openssl@1.1)/include"
export LDFLAGS="-L$(brew --prefix gettext)/lib -L$(brew --prefix icu4c)/lib -L$(brew --prefix qt@6)/lib -L$(brew --prefix readline)/lib -L$(brew --prefix unixodbc)/lib -L$(brew --prefix mysql-client@5.7)/lib -L$(brew --prefix openssl@1.1)/lib"
export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig"

export MOCCMD=$(find /usr/local/Cellar/qt -name "moc" | head -n 1)
Expand Down

0 comments on commit 6caacb7

Please sign in to comment.