From 0dcd4f967eaa135b3dd6222ae6f0e5ad1f4c49f0 Mon Sep 17 00:00:00 2001 From: Adam <893184+NotAdam@users.noreply.github.com> Date: Sat, 27 Nov 2021 16:04:45 +1100 Subject: [PATCH 1/2] fixup mariadb support --- cmake/FindMySQL.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 034e94d7..0042d308 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -85,6 +85,8 @@ find_path(MYSQL_INCLUDE_DIR "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include" "${PROGRAM_FILES_64}/MySQL/include" "${PROGRAM_FILES_64}/MariaDB 10.3/include/mysql" + "${PROGRAM_FILES_64}/MariaDB 10.4/include/mysql" + "${PROGRAM_FILES_64}/MariaDB 10.5/include/mysql" "C:/MySQL/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/include" "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/include" @@ -124,6 +126,8 @@ if( WIN32 ) "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt" "${PROGRAM_FILES_64}/MySQL/lib" "${PROGRAM_FILES_64}/MariaDB 10.3/lib" + "${PROGRAM_FILES_64}/MariaDB 10.4/lib" + "${PROGRAM_FILES_64}/MariaDB 10.5/lib" "C:/MySQL/lib/debug" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt" @@ -177,6 +181,8 @@ if( WIN32 ) "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt" "${PROGRAM_FILES_64}/MySQL/bin" "${PROGRAM_FILES_64}/MariaDB 10.3/bin" + "${PROGRAM_FILES_64}/MariaDB 10.4/bin" + "${PROGRAM_FILES_64}/MariaDB 10.5/bin" "C:/MySQL/bin/debug" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt" From 790650f967706eb1d8c48d81b789417de1620375 Mon Sep 17 00:00:00 2001 From: Adam <893184+NotAdam@users.noreply.github.com> Date: Sat, 27 Nov 2021 18:31:38 +1100 Subject: [PATCH 2/2] working ci & support more mariadb versions --- .github/workflows/build.yml | 55 +++++++++++++++++++++++++++++++++++++ cmake/FindMySQL.cmake | 22 +++++++++------ 2 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..c5e4dbba --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,55 @@ +name: Build + +on: + push: + pull_request: + +jobs: + ubuntu: + strategy: + fail-fast: false + matrix: + buildType: [RelWithDebInfo, Debug] + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - name: install deps + run: sudo apt install -y ninja-build libmariadb-dev zlib1g-dev mariadb-server + - name: cmake + run: | + mkdir build + cd build + cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.buildType }} + - name: build sapphire + run: cd build && ninja + + windows: + strategy: + fail-fast: false + matrix: + buildType: [RelWithDebInfo, Debug] + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - name: Enable Developer Command Prompt + uses: ilammy/msvc-dev-cmd@v1.10.0 + - name: install deps & remove default garbage + run: | + $env:PATH + choco install --no-progress mariadb ninja + choco list --local-only + - name: cmake init + run: | + mkdir build + cd build + cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.buildType }} -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl + - name: build sapphire + run: cd build && ninja diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 0042d308..a373d68b 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -82,11 +82,13 @@ find_path(MYSQL_INCLUDE_DIR /usr/local/include /usr/local/include/mysql /usr/local/mysql/include - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include" - "${PROGRAM_FILES_64}/MySQL/include" "${PROGRAM_FILES_64}/MariaDB 10.3/include/mysql" "${PROGRAM_FILES_64}/MariaDB 10.4/include/mysql" "${PROGRAM_FILES_64}/MariaDB 10.5/include/mysql" + "${PROGRAM_FILES_64}/MariaDB 10.6/include/mysql" + "${PROGRAM_FILES_64}/MariaDB 10.7/include/mysql" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include" + "${PROGRAM_FILES_64}/MySQL/include" "C:/MySQL/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/include" "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/include" @@ -122,12 +124,14 @@ if( WIN32 ) libmariadb PATHS ${MYSQL_ADD_LIBRARIES_PATH} - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt" - "${PROGRAM_FILES_64}/MySQL/lib" "${PROGRAM_FILES_64}/MariaDB 10.3/lib" "${PROGRAM_FILES_64}/MariaDB 10.4/lib" "${PROGRAM_FILES_64}/MariaDB 10.5/lib" + "${PROGRAM_FILES_64}/MariaDB 10.6/include/mysql" + "${PROGRAM_FILES_64}/MariaDB 10.7/include/mysql" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt" + "${PROGRAM_FILES_64}/MySQL/lib" "C:/MySQL/lib/debug" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt" @@ -177,12 +181,14 @@ endif( UNIX ) if( WIN32 ) find_program(MYSQL_EXECUTABLE mysql PATHS - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt" - "${PROGRAM_FILES_64}/MySQL/bin" "${PROGRAM_FILES_64}/MariaDB 10.3/bin" "${PROGRAM_FILES_64}/MariaDB 10.4/bin" "${PROGRAM_FILES_64}/MariaDB 10.5/bin" + "${PROGRAM_FILES_64}/MariaDB 10.6/include/mysql" + "${PROGRAM_FILES_64}/MariaDB 10.7/include/mysql" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt" + "${PROGRAM_FILES_64}/MySQL/bin" "C:/MySQL/bin/debug" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt"