mirror of https://github.com/davisking/dlib.git
more tweaks cleanup and fixes for ci builds
This commit is contained in:
parent
c458c4f202
commit
71d95d76d9
|
@ -114,6 +114,17 @@ jobs:
|
|||
- name: Build ancillary tools
|
||||
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --target imglab htmlify dtoc --parallel 4
|
||||
|
||||
windows-2016:
|
||||
runs-on: 'windows-2016'
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Configure
|
||||
run: cmake . -B ${{ env.build_dir }}
|
||||
- name: Build just tests
|
||||
run: cmake --build ${{ env.build_dir }} --config Debug --target dtest --parallel 4
|
||||
- name: Build ancillary tools
|
||||
run: cmake --build ${{ env.build_dir }} --config ${{ env.config }} --target imglab htmlify dtoc --parallel 4
|
||||
|
||||
macos-latest:
|
||||
runs-on: 'macos-latest'
|
||||
steps:
|
||||
|
|
|
@ -32,6 +32,7 @@ jobs:
|
|||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-python@v4
|
||||
- name: Build
|
||||
run: |
|
||||
python setup.py build
|
||||
python setup.py install --user
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# dlib C++ library [![Travis Status](https://travis-ci.com/davisking/dlib.svg?branch=master)](https://app.travis-ci.com/github/davisking/dlib) [![GitHub Actions C++ Status](https://github.com/davisking/dlib/actions/workflows/build_cpp.yml/badge.svg)](https://github.com/davisking/dlib/actions/workflows/build_cpp.yml) [![GitHub Actions Python Status](https://github.com/davisking/dlib/actions/workflows/build_python.yml/badge.svg)](https://github.com/davisking/dlib/actions/workflows/build_python.yml)
|
||||
# dlib C++ library [![GitHub Actions C++ Status](https://github.com/davisking/dlib/actions/workflows/build_cpp.yml/badge.svg)](https://github.com/davisking/dlib/actions/workflows/build_cpp.yml) [![GitHub Actions Python Status](https://github.com/davisking/dlib/actions/workflows/build_python.yml/badge.svg)](https://github.com/davisking/dlib/actions/workflows/build_python.yml)
|
||||
|
||||
Dlib is a modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ to solve real world problems. See [http://dlib.net](http://dlib.net) for the main project documentation and API reference.
|
||||
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
version: "{build}"
|
||||
|
||||
configuration: Release
|
||||
|
||||
build_script:
|
||||
# build test
|
||||
- mkdir %APPVEYOR_BUILD_FOLDER%\build_test
|
||||
- cd %APPVEYOR_BUILD_FOLDER%\build_test
|
||||
- cmake -G "Visual Studio 14 2015 Win64" -T host=x64 ../dlib/test
|
||||
- cmake --build . --config %CONFIGURATION% --target dlib_all_source_cpp
|
||||
- cmake --build . --config %CONFIGURATION% --target imglab
|
||||
- cmake --build . --config %CONFIGURATION% --target htmlify
|
||||
- cmake --build . --config %CONFIGURATION% --target gui
|
||||
- cmake --build . --config %CONFIGURATION% --target dtest
|
||||
|
||||
test_script:
|
||||
# run test
|
||||
- cd %APPVEYOR_BUILD_FOLDER%\build_test\%CONFIGURATION%
|
||||
- dtest --runall
|
|
@ -1,21 +0,0 @@
|
|||
version: "{build}"
|
||||
|
||||
configuration: Release
|
||||
|
||||
image: Visual Studio 2017
|
||||
|
||||
build_script:
|
||||
# build test
|
||||
- mkdir %APPVEYOR_BUILD_FOLDER%\build_test
|
||||
- cd %APPVEYOR_BUILD_FOLDER%\build_test
|
||||
- cmake -G "Visual Studio 15 2017 Win64" -T host=x64 ../dlib/test
|
||||
- cmake --build . --config %CONFIGURATION% --target dlib_all_source_cpp
|
||||
- cmake --build . --config %CONFIGURATION% --target imglab
|
||||
- cmake --build . --config %CONFIGURATION% --target htmlify
|
||||
- cmake --build . --config %CONFIGURATION% --target gui
|
||||
- cmake --build . --config %CONFIGURATION% --target dtest
|
||||
|
||||
test_script:
|
||||
# run test
|
||||
- cd %APPVEYOR_BUILD_FOLDER%\build_test\%CONFIGURATION%
|
||||
- dtest --runall
|
|
@ -1,16 +0,0 @@
|
|||
version: "{build}"
|
||||
|
||||
configuration: Release
|
||||
|
||||
image: Visual Studio 2017
|
||||
|
||||
build_script:
|
||||
# build test
|
||||
- mkdir %APPVEYOR_BUILD_FOLDER%\build_examples
|
||||
- cd %APPVEYOR_BUILD_FOLDER%\build_examples
|
||||
#- cmake -G "Visual Studio 14 2015 Win64" -T host=x64 ../examples
|
||||
- cmake -G "Visual Studio 15 2017 Win64" -T host=x64 ../examples
|
||||
- cmake --build . --config %CONFIGURATION%
|
||||
|
||||
test_script:
|
||||
# run test
|
|
@ -1,14 +0,0 @@
|
|||
|
||||
environment:
|
||||
matrix:
|
||||
- PATH: C:\Python36;%PATH%
|
||||
- PATH: C:\Python36-x64;%PATH%
|
||||
- PATH: C:\Python37;%PATH%
|
||||
- PATH: C:\Python37-x64;%PATH%
|
||||
|
||||
|
||||
build_script:
|
||||
- python setup.py build --clean
|
||||
|
||||
test_script:
|
||||
- python setup.py test
|
Loading…
Reference in New Issue