diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 70d4d921..00000000 --- a/.appveyor.yml +++ /dev/null @@ -1,29 +0,0 @@ -os: - - Visual Studio 2017 - -configuration: - - Debug - -platform: - - Win64 - -environment: - MSVC_DEFAULT_OPTIONS: ON - MYSQL_PWD: "Password12!" - -services: - - mysql - -before_build: - - set PATH="C:\\Program Files\\MySQL\\MySQL Server 5.7\\bin";%PATH% - - cd c:\projects\sapphire - - git submodule update --init - - mkdir build - - cd build - - cmake .. -G "Visual Studio 15 2017 Win64" - - cmake --build . --target ALL_BUILD --config Release - -build_script: - - cd bin - - copy "C:\Program Files\MySQL\MySQL Server 5.7\lib\libmysql.dll" libmysql.dll - - sh sql_import.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5e4dbba..e429459b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,11 +41,9 @@ jobs: submodules: recursive - name: Enable Developer Command Prompt uses: ilammy/msvc-dev-cmd@v1.10.0 - - name: install deps & remove default garbage + - name: install deps run: | - $env:PATH choco install --no-progress mariadb ninja - choco list --local-only - name: cmake init run: | mkdir build diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 375d4353..00000000 --- a/.travis.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -language: c++ - -sudo: enabled - -git: - depth: 5 - -matrix: - include: - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-7 - env: - - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" - -# Setup cache -cache: - directories: - - build - - .mtime_cache - -# Setup build matrix and dependencies -before_install: - - eval "${MATRIX_EVAL}" - - gem install mtime_cache --no-document - - sudo apt-get update - - sudo apt-get install -y libmysqlclient-dev - -# Build steps -script: - - $CXX --version - - mtime_cache src/**/*.{%{cpp}} -c .mtime_cache/cache.json - - mkdir -p build - - cd build - - cmake .. && make -j 3 - - cd bin - - bash sql_import.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index cb4fcae7..c46151f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ find_package( MySQL ) add_subdirectory( "deps/zlib" ) add_subdirectory( "deps/MySQL" ) add_subdirectory( "deps/datReader" ) -add_subdirectory( "deps/datReaderPs3" ) +#add_subdirectory( "deps/datReaderPs3" ) add_subdirectory( "deps/mysqlConnector" ) add_subdirectory( "deps/recastnavigation" )