From 71d95d76d9c0eca2238f099a96b33d9918d75331 Mon Sep 17 00:00:00 2001 From: Davis King Date: Tue, 12 Jul 2022 20:40:11 -0400 Subject: [PATCH] more tweaks cleanup and fixes for ci builds --- .github/workflows/build_cpp.yml | 11 +++++++++++ .github/workflows/build_python.yml | 1 + README.md | 2 +- dlib/appveyor/dtest.yml | 19 ------------------- dlib/appveyor/dtest_vc2017.yml | 21 --------------------- dlib/appveyor/examples.yml | 16 ---------------- dlib/appveyor/python.yml | 14 -------------- 7 files changed, 13 insertions(+), 71 deletions(-) delete mode 100644 dlib/appveyor/dtest.yml delete mode 100644 dlib/appveyor/dtest_vc2017.yml delete mode 100644 dlib/appveyor/examples.yml delete mode 100644 dlib/appveyor/python.yml diff --git a/.github/workflows/build_cpp.yml b/.github/workflows/build_cpp.yml index fd7410295..29c5bc54d 100644 --- a/.github/workflows/build_cpp.yml +++ b/.github/workflows/build_cpp.yml @@ -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: diff --git a/.github/workflows/build_python.yml b/.github/workflows/build_python.yml index 8299f54c1..9cc9cf6b6 100644 --- a/.github/workflows/build_python.yml +++ b/.github/workflows/build_python.yml @@ -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 diff --git a/README.md b/README.md index c575ab759..da1ec8700 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/dlib/appveyor/dtest.yml b/dlib/appveyor/dtest.yml deleted file mode 100644 index 212528eb1..000000000 --- a/dlib/appveyor/dtest.yml +++ /dev/null @@ -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 diff --git a/dlib/appveyor/dtest_vc2017.yml b/dlib/appveyor/dtest_vc2017.yml deleted file mode 100644 index 9e5e72ee9..000000000 --- a/dlib/appveyor/dtest_vc2017.yml +++ /dev/null @@ -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 diff --git a/dlib/appveyor/examples.yml b/dlib/appveyor/examples.yml deleted file mode 100644 index 55791d224..000000000 --- a/dlib/appveyor/examples.yml +++ /dev/null @@ -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 diff --git a/dlib/appveyor/python.yml b/dlib/appveyor/python.yml deleted file mode 100644 index 3a416216c..000000000 --- a/dlib/appveyor/python.yml +++ /dev/null @@ -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