Try using default MariaDB server version (fixes #6079)

This commit is contained in:
Dennis Felsing 2022-12-01 22:40:29 +01:00
parent 3012a42ea0
commit c291fe7eb9
2 changed files with 3 additions and 3 deletions

View file

@ -71,7 +71,8 @@ jobs:
- name: Prepare Linux (fancy)
if: contains(matrix.os, 'ubuntu') && matrix.fancy
run: |
sudo apt-get install libmariadbclient-dev libwebsockets-dev mariadb-server-10.3 -y
sudo apt-get install libmariadb-dev libwebsockets-dev mariadb-server -y
sudo systemctl stop mysql
sudo rm -rf /var/lib/mysql/
sudo mysql_install_db --user=mysql --datadir=/var/lib/mysql/
cd /usr; sudo mysqld_safe --datadir='/var/lib/mysql/' --no-watch
@ -181,7 +182,6 @@ jobs:
- name: Test fancy
if: matrix.fancy
run: |
find /usr/lib/ -name '*libwebsockets*'
cd fancy
${{ matrix.cmake-path }}cmake -E env ${{ matrix.gtest-env }} ${{ matrix.cmake-path }}cmake --build . --config RelWithDebInfo --target run_tests ${{ matrix.build-args }}

View file

@ -38,7 +38,7 @@ jobs:
if: matrix.language == 'cpp'
run: |
sudo apt-get update -y
sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libmariadbclient-dev libwebsockets-dev libvulkan-dev glslang-tools spirv-tools -y
sudo apt-get install pkg-config cmake ninja-build libfreetype6-dev libnotify-dev libsdl2-dev libsqlite3-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libx264-dev libmariadb-dev libwebsockets-dev libvulkan-dev glslang-tools spirv-tools -y
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL