Skip to content

Commit

Permalink
Merge pull request #77 from kerautret/removeAppveyor
Browse files Browse the repository at this point in the history
Remove appveyor
  • Loading branch information
kerautret authored Nov 17, 2023
2 parents 42a2e78 + 96f8afd commit ffaa6ab
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 89 deletions.
39 changes: 37 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ env:
CONFIG_GLOBAL:
CONFIG_LINUX: -DWITH_MAGICK=true -DWITH_GMP=true -DWITH_FFTW3=true -DWARNING_AS_ERROR=ON -DWITH_HDF5=true -DWITH_QGLVIEWER=true -DWITH_CAIRO=true -DWITH_EIGEN=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true
CONFIG_MAC: -DWITH_EIGEN=true -DWITH_GMP=tue

CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest, macOS-latest]
os: [ubuntu-latest, macOS-latest,windows-latest]

steps:
- uses: actions/checkout@v2
Expand All @@ -35,6 +35,24 @@ jobs:
if: matrix.os == 'macOS-latest'
run: brew install boost ninja eigen gmp

- name: Install conan
if: matrix.os == 'windows-latest'
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.57.0

- name: Create conan default profile
if: matrix.os == 'windows-latest'
run: conan profile new default --detect

- uses: actions/cache@v3
if: matrix.os == 'windows-latest'
with:
path: ~/.conan
key: ${{ runner.os }}-conan-Release


- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

Expand Down Expand Up @@ -64,6 +82,18 @@ jobs:
echo cmake .. $CONFIG_MAC -DBUILD_EXAMPLES=false -DBUILD_TESTING=false -G Ninja
cmake .. $CONFIG_MAC -DBUILD_EXAMPLES=false -DBUILD_TESTING=false -G Ninja
ninja
- name: DGtalBuild (windows)
if: matrix.os == 'windows-latest'
shell: bash
working-directory: ${{runner.workspace}}/build
run: |
git clone --depth 1 https://github.com/DGtal-team/DGtal.git
cd DGtal
mkdir buildDGtal
cd buildDGtal
echo cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false
cmake --build . --config Release --parallel 3
- name: Configure CMake (linux)
if: matrix.os == 'ubuntu-latest'
Expand All @@ -76,6 +106,11 @@ jobs:
shell: bash
working-directory: ${{runner.workspace}}/build
run: cmake $GITHUB_WORKSPACE -DDGtal_DIR=${{runner.workspace}}/build/DGtal/buildDGtal -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_GLOBAL $CONFIG_MAC -G Ninja
- name: Configure CMake (windows)
if: matrix.os == 'windows-latest'
shell: bash
working-directory: "${{runner.workspace}}/build"
run: cmake $GITHUB_WORKSPACE -DCMAKE_MODULE_PATH="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}"

- name: Build
working-directory: ${{runner.workspace}}/build
Expand Down
3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# DGtalTools-contrib 1.4 (beta)
- *global*
- Continuous integration on windows does not use Appveyopr anymore but Github Actions.
(Bertrand Kerautret [#77](https://github.com/DGtal-team/DGtalTools-contrib/pull/77))

- *Geometry2d*
- rotNmap: new tools to apply a rotation in the input normal map (it
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ More Information
* Release 0.9.3 DOI [![DOI](https://zenodo.org/badge/43562168.svg)](https://zenodo.org/badge/latestdoi/43562168)
* Release 0.9.2 DOI [![DOI](https://zenodo.org/badge/4888/DGtal-team/DGtalTools-contrib.svg)](https://zenodo.org/badge/latestdoi/4888/DGtal-team/DGtalTools-contrib)
* Release 0.9.1 DOI [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.45131.svg)](http://dx.doi.org/10.5281/zenodo.45131)
* Continuous Integration (Linux/MacOS) ![Build status](https://github.com/DGtal-team/DGtalTools-contrib/actions/workflows/build.yml/badge.svg)
* Continuous Integration (Windows): [![Build status](https://ci.appveyor.com/api/projects/status/sq9w7r1xs8078g7j?svg=true)](https://ci.appveyor.com/project/kerautret/dgtaltools-contrib)
* Continuous Integration (Linux/MacOS/Windows) ![Build status](https://github.com/DGtal-team/DGtalTools-contrib/actions/workflows/build.yml/badge.svg)


Organisation
============
Expand Down
84 changes: 0 additions & 84 deletions appveyor.yml

This file was deleted.

2 changes: 1 addition & 1 deletion visualisation/displaySet2dPts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ int main( int argc, char** argv )
// use max limit of 512 to avoid xfig bug display
if (extension == "fig")
{
aBoard.setPenColor(hueMap(rand()%(min<uint>(setOfPoints.size(),512))));
aBoard.setPenColor(hueMap(rand()%(min<unsigned int>(setOfPoints.size(),512))));
}
else
{
Expand Down

0 comments on commit ffaa6ab

Please sign in to comment.