From 5b4c1c3fa90dc6cfd15566c3edb330693ee6bbe7 Mon Sep 17 00:00:00 2001 From: dawsoneliasen Date: Sun, 16 Aug 2020 17:05:48 -0600 Subject: [PATCH 01/22] add macos --- .github/workflows/SampleFlow-test.yml | 28 ++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index c0a2260a..d7d5e5fc 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -8,7 +8,8 @@ on: jobs: - build: + + build-linux: runs-on: ubuntu-latest @@ -32,3 +33,28 @@ jobs: cd ../../.. ./doc/indent git --no-pager diff --exit-code + + build-macos: + + runs-on: macos-latest + + steps: + - uses: actions/checkout@v2 + - name: install dependencies + run: | + sudo apt-get install doxygen graphviz libboost-all-dev numdiff -y + doxygen --version + - name: cmake + run: cmake . + - name: ctest + run: ctest --output-on-failure -j2 + - name: doc + run: make doc + - name: style + run: | + wget -O astyle_2.04_linux.tar.gz https://sourceforge.net/projects/astyle/files/astyle/astyle%202.04/astyle_2.04_linux.tar.gz/download + tar -xvf astyle_2.04_linux.tar.gz + cd astyle/build/gcc && make && sudo make install + cd ../../.. + ./doc/indent + git --no-pager diff --exit-code From d7bc4edfa6fd57743ea2f8267e6c688a5ecb5542 Mon Sep 17 00:00:00 2001 From: dawsoneliasen Date: Sun, 16 Aug 2020 17:21:37 -0600 Subject: [PATCH 02/22] add windows check --- .github/workflows/SampleFlow-test.yml | 30 +++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index d7d5e5fc..cecbd7f9 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -42,19 +42,27 @@ jobs: - uses: actions/checkout@v2 - name: install dependencies run: | - sudo apt-get install doxygen graphviz libboost-all-dev numdiff -y - doxygen --version + brew install cmake boost numdiff -y - name: cmake run: cmake . - name: ctest run: ctest --output-on-failure -j2 - - name: doc - run: make doc - - name: style + + build-windows: + + runs-on: windows-lastest + + steps: + - uses: actions/checkout@v2 + - name: install dependencies run: | - wget -O astyle_2.04_linux.tar.gz https://sourceforge.net/projects/astyle/files/astyle/astyle%202.04/astyle_2.04_linux.tar.gz/download - tar -xvf astyle_2.04_linux.tar.gz - cd astyle/build/gcc && make && sudo make install - cd ../../.. - ./doc/indent - git --no-pager diff --exit-code + wget -O boost.zip https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.zip + tar -xf boost.zip + cd boost + bootstrap.bat mingw + b2 install --prefix=c:/boost toolset=gcc + cd .. + - name: cmake + run: cmake . + - name: ctest + run: ctest --output-on-failure -j2 From c847adf4f6eba5d6b0ef9d78b75ac2583a1d5fab Mon Sep 17 00:00:00 2001 From: dawsoneliasen Date: Sun, 16 Aug 2020 17:32:55 -0600 Subject: [PATCH 03/22] remove -y from brew install --- .github/workflows/SampleFlow-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index cecbd7f9..dfb975d6 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/checkout@v2 - name: install dependencies run: | - brew install cmake boost numdiff -y + brew install cmake boost numdiff - name: cmake run: cmake . - name: ctest From 10b469381065195015ce57c2b16bf1bb49f5946b Mon Sep 17 00:00:00 2001 From: dawsoneliasen Date: Sun, 16 Aug 2020 17:49:35 -0600 Subject: [PATCH 04/22] compile numdiff from source --- .github/workflows/SampleFlow-test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index dfb975d6..c9336292 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -42,7 +42,12 @@ jobs: - uses: actions/checkout@v2 - name: install dependencies run: | - brew install cmake boost numdiff + brew install cmake boost + git clone https://github.com/tjhei/numdiff.git + cd numdiff + ./configure + make && make install + cd .. - name: cmake run: cmake . - name: ctest From b710e081d2684435eb50cb3df0b1ef38cf1d8fcb Mon Sep 17 00:00:00 2001 From: dawsoneliasen Date: Sun, 16 Aug 2020 17:53:40 -0600 Subject: [PATCH 05/22] windows comes with boost installed --- .github/workflows/SampleFlow-test.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index c9336292..aaf78553 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -46,7 +46,7 @@ jobs: git clone https://github.com/tjhei/numdiff.git cd numdiff ./configure - make && make install + make && sudo make install cd .. - name: cmake run: cmake . @@ -59,14 +59,6 @@ jobs: steps: - uses: actions/checkout@v2 - - name: install dependencies - run: | - wget -O boost.zip https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.zip - tar -xf boost.zip - cd boost - bootstrap.bat mingw - b2 install --prefix=c:/boost toolset=gcc - cd .. - name: cmake run: cmake . - name: ctest From fe610857f6ff3edc457113e5abd7dee640de2dee Mon Sep 17 00:00:00 2001 From: dawsoneliasen Date: Sun, 16 Aug 2020 17:59:02 -0600 Subject: [PATCH 06/22] install doxygen on macos, spell 'latest' correctly --- .github/workflows/SampleFlow-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index aaf78553..ac1cfa09 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/checkout@v2 - name: install dependencies run: | - brew install cmake boost + brew install cmake boost doxygen git clone https://github.com/tjhei/numdiff.git cd numdiff ./configure @@ -55,7 +55,7 @@ jobs: build-windows: - runs-on: windows-lastest + runs-on: windows-latest steps: - uses: actions/checkout@v2 From 72a4b5ee317be2a9505cc882a3e854cac3599c4e Mon Sep 17 00:00:00 2001 From: dawsoneliasen Date: Sun, 16 Aug 2020 18:06:29 -0600 Subject: [PATCH 07/22] setup boost on windows --- .github/workflows/SampleFlow-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index ac1cfa09..58317c45 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -59,6 +59,8 @@ jobs: steps: - uses: actions/checkout@v2 + - name: setup-boost + run: export BOOST_ROOT=$BOOST_ROOT_1_72_0 - name: cmake run: cmake . - name: ctest From f9c590e3440f7a7d8744630ed0985bdba564269d Mon Sep 17 00:00:00 2001 From: dawsoneliasen Date: Sun, 16 Aug 2020 18:11:29 -0600 Subject: [PATCH 08/22] oops can't use bash --- .github/workflows/SampleFlow-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index 58317c45..42f94df2 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -60,7 +60,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup-boost - run: export BOOST_ROOT=$BOOST_ROOT_1_72_0 + run: setx BOOST_ROOT %BOOST_ROOT_1_72_0% - name: cmake run: cmake . - name: ctest From f50487531374278c8561742887bf887854e14f9f Mon Sep 17 00:00:00 2001 From: dawsoneliasen Date: Sun, 16 Aug 2020 18:18:15 -0600 Subject: [PATCH 09/22] try requiring boost 1.72 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 41c9cb8c..085b95fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES(include ${CMAKE_BINARY_DIR}/include) # Set paths correctly to take BOOST from wherever it is # installed on the current system -FIND_PACKAGE(Boost 1.39 REQUIRED) +FIND_PACKAGE(Boost 1.72 REQUIRED) INCLUDE(CheckIncludeFileCXX) MESSAGE(STATUS "Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}") From 108c42cc9965054f96f5c82951bf1193a52470d4 Mon Sep 17 00:00:00 2001 From: dawsoneliasen Date: Sun, 16 Aug 2020 18:25:06 -0600 Subject: [PATCH 10/22] try a lighter requirement for boost --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 085b95fa..0657d84c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES(include ${CMAKE_BINARY_DIR}/include) # Set paths correctly to take BOOST from wherever it is # installed on the current system -FIND_PACKAGE(Boost 1.72 REQUIRED) +FIND_PACKAGE(Boost REQUIRED COMPONENTS system) INCLUDE(CheckIncludeFileCXX) MESSAGE(STATUS "Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}") From dd2b69a6f7fdc7f0831b753831120861c7be8ba4 Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Wed, 19 Aug 2020 15:10:40 -0600 Subject: [PATCH 11/22] Update .github/workflows/SampleFlow-test.yml Co-authored-by: Wolfgang Bangerth --- .github/workflows/SampleFlow-test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index 42f94df2..5045f97d 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -60,7 +60,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: setup-boost - run: setx BOOST_ROOT %BOOST_ROOT_1_72_0% + run: | + setx BOOST_ROOT %BOOST_ROOT_1_72_0% + echo "boost dir" %BOOST_ROOT_1_72_0% + echo "boost dir $BOOST_ROOT_1_72_0 + dir %BOOST_ROOT_1_72_0% - name: cmake run: cmake . - name: ctest From 4e96d1a52a7b616175bba37c9a51f8e27539e4ed Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Wed, 19 Aug 2020 15:15:11 -0600 Subject: [PATCH 12/22] Update .github/workflows/SampleFlow-test.yml --- .github/workflows/SampleFlow-test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index 5045f97d..a6c93c05 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -63,7 +63,6 @@ jobs: run: | setx BOOST_ROOT %BOOST_ROOT_1_72_0% echo "boost dir" %BOOST_ROOT_1_72_0% - echo "boost dir $BOOST_ROOT_1_72_0 dir %BOOST_ROOT_1_72_0% - name: cmake run: cmake . From b58b2edcb887b2737f44caf7e592603754795508 Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Wed, 19 Aug 2020 15:51:50 -0600 Subject: [PATCH 13/22] Update .github/workflows/SampleFlow-test.yml --- .github/workflows/SampleFlow-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index a6c93c05..b067a569 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -62,7 +62,7 @@ jobs: - name: setup-boost run: | setx BOOST_ROOT %BOOST_ROOT_1_72_0% - echo "boost dir" %BOOST_ROOT_1_72_0% + echo "boost dir" $env:BOOST_ROOT_1_72_0 dir %BOOST_ROOT_1_72_0% - name: cmake run: cmake . From 3a5f322cae6afc424e7e5b236a9a5ea1077b1e3f Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Wed, 19 Aug 2020 15:51:56 -0600 Subject: [PATCH 14/22] Update .github/workflows/SampleFlow-test.yml --- .github/workflows/SampleFlow-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index b067a569..c76edf03 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -61,7 +61,7 @@ jobs: - uses: actions/checkout@v2 - name: setup-boost run: | - setx BOOST_ROOT %BOOST_ROOT_1_72_0% + setx BOOST_ROOT $env:BOOST_ROOT_1_72_0 echo "boost dir" $env:BOOST_ROOT_1_72_0 dir %BOOST_ROOT_1_72_0% - name: cmake From 8052402afd03ff82f42fc1fae5c8f5d9e782c51f Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Wed, 19 Aug 2020 15:56:20 -0600 Subject: [PATCH 15/22] Update .github/workflows/SampleFlow-test.yml --- .github/workflows/SampleFlow-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index c76edf03..57871b39 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -63,7 +63,7 @@ jobs: run: | setx BOOST_ROOT $env:BOOST_ROOT_1_72_0 echo "boost dir" $env:BOOST_ROOT_1_72_0 - dir %BOOST_ROOT_1_72_0% + dir $env:BOOST_ROOT_1_72_0 - name: cmake run: cmake . - name: ctest From 1e16e112c8d4fba065e063fa80ff4bdf77fbce18 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 19 Aug 2020 16:53:56 -0600 Subject: [PATCH 16/22] Update .github/workflows/SampleFlow-test.yml --- .github/workflows/SampleFlow-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index 57871b39..88a710bf 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -63,7 +63,7 @@ jobs: run: | setx BOOST_ROOT $env:BOOST_ROOT_1_72_0 echo "boost dir" $env:BOOST_ROOT_1_72_0 - dir $env:BOOST_ROOT_1_72_0 + dir $env:BOOST_ROOT - name: cmake run: cmake . - name: ctest From bbe31f533492eded4cc684dd4c06e139e9aa23a9 Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Thu, 20 Aug 2020 09:03:36 -0600 Subject: [PATCH 17/22] Update .github/workflows/SampleFlow-test.yml --- .github/workflows/SampleFlow-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index 88a710bf..61b9d232 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -61,7 +61,7 @@ jobs: - uses: actions/checkout@v2 - name: setup-boost run: | - setx BOOST_ROOT $env:BOOST_ROOT_1_72_0 + $Env:BOOST_ROOT = $env:BOOST_ROOT_1_72_0 echo "boost dir" $env:BOOST_ROOT_1_72_0 dir $env:BOOST_ROOT - name: cmake From 4c1b78bfb3b0cae6d43be940a56348dd9fb09218 Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Tue, 25 Aug 2020 20:44:31 -0600 Subject: [PATCH 18/22] Update .github/workflows/SampleFlow-test.yml --- .github/workflows/SampleFlow-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index 61b9d232..67bd072a 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -62,8 +62,7 @@ jobs: - name: setup-boost run: | $Env:BOOST_ROOT = $env:BOOST_ROOT_1_72_0 - echo "boost dir" $env:BOOST_ROOT_1_72_0 - dir $env:BOOST_ROOT + $Env:Boost_INCLUDE_DIR = "$env:BOOST_ROOT\include" - name: cmake run: cmake . - name: ctest From 16a3ba2ec197e3e25a63653f016a3ff927f0bc82 Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Tue, 25 Aug 2020 21:00:31 -0600 Subject: [PATCH 19/22] Update .github/workflows/SampleFlow-test.yml --- .github/workflows/SampleFlow-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index 67bd072a..de8bde9a 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -63,6 +63,9 @@ jobs: run: | $Env:BOOST_ROOT = $env:BOOST_ROOT_1_72_0 $Env:Boost_INCLUDE_DIR = "$env:BOOST_ROOT\include" + cd $env:BOOST_ROOT + bootstrap + .\b2 - name: cmake run: cmake . - name: ctest From a12356798ddc6bbd2c841fa5de63b8093f1f54a0 Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Tue, 25 Aug 2020 21:30:11 -0600 Subject: [PATCH 20/22] Update .github/workflows/SampleFlow-test.yml --- .github/workflows/SampleFlow-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index de8bde9a..67bd072a 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -63,9 +63,6 @@ jobs: run: | $Env:BOOST_ROOT = $env:BOOST_ROOT_1_72_0 $Env:Boost_INCLUDE_DIR = "$env:BOOST_ROOT\include" - cd $env:BOOST_ROOT - bootstrap - .\b2 - name: cmake run: cmake . - name: ctest From d9c09b70762141b914b28820a7687db8273db1b6 Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Tue, 25 Aug 2020 21:35:22 -0600 Subject: [PATCH 21/22] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0657d84c..41c9cb8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES(include ${CMAKE_BINARY_DIR}/include) # Set paths correctly to take BOOST from wherever it is # installed on the current system -FIND_PACKAGE(Boost REQUIRED COMPONENTS system) +FIND_PACKAGE(Boost 1.39 REQUIRED) INCLUDE(CheckIncludeFileCXX) MESSAGE(STATUS "Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}") From 3c80b6841f56b8571db208f301e185b7931d0d14 Mon Sep 17 00:00:00 2001 From: Dawson Eliasen Date: Wed, 26 Aug 2020 15:13:21 -0600 Subject: [PATCH 22/22] Update .github/workflows/SampleFlow-test.yml --- .github/workflows/SampleFlow-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SampleFlow-test.yml b/.github/workflows/SampleFlow-test.yml index 67bd072a..2edbd121 100644 --- a/.github/workflows/SampleFlow-test.yml +++ b/.github/workflows/SampleFlow-test.yml @@ -64,6 +64,6 @@ jobs: $Env:BOOST_ROOT = $env:BOOST_ROOT_1_72_0 $Env:Boost_INCLUDE_DIR = "$env:BOOST_ROOT\include" - name: cmake - run: cmake . + run: cmake . || cat CMakeFiles/CMakeError.log - name: ctest run: ctest --output-on-failure -j2