From 7d0bae8d71b044f2aa83a289ff5f07259273eecf Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 19:47:18 +0200 Subject: [PATCH 01/11] Dependencies and CMake minimum version update --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ba37e5..3e8b755 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required( VERSION 2.8 ) +cmake_minimum_required( VERSION 2.8.12 ) project(plotIt LANGUAGES CXX) @@ -16,15 +16,15 @@ find_package(Boost REQUIRED COMPONENTS filesystem regex system) ExternalProject_Add( yaml-cpp-build - URL https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.6.2.tar.gz - CMAKE_ARGS -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_BUILD_CONTRIB=OFF -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/external + URL https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.7.0.tar.gz + CMAKE_ARGS -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_BUILD_CONTRIB=OFF -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/external -DCMAKE_CXX_FLAGS='-Wno-error=maybe-uninitialized' ) add_library(yaml-cpp STATIC IMPORTED) add_dependencies(yaml-cpp yaml-cpp-build) set_target_properties(yaml-cpp PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/lib/libyaml-cpp.a) ExternalProject_Add( tclap - URL https://github.com/mirror/tclap/archive/tclap-1-2-1-release-final.tar.gz + URL https://github.com/mirror/tclap/archive/refs/tags/v1.2.4.tar.gz BUILD_IN_SOURCE 1 PATCH_COMMAND ./autotools.sh CONFIGURE_COMMAND ./configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/external From 183c69cdfa237e8f368cf304cf5a9fcbcd33df45 Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 19:47:37 +0200 Subject: [PATCH 02/11] Add GitHub actions config --- .github/workflows/main.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..1f2684c --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,34 @@ +name: plotIt tests CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + + workflow_dispatch: + +jobs: + tests: + name: plotIt tests + runs-on: ubuntu-latest + container: rootproject/root:latest + + steps: + - uses: actions/checkout@v2 + - name: Install dependencies + run: | + sudo apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev git make ghostscript cmake + pip install pyyaml requests + mkdir -p $HOME/.config/ImageMagick + cp test/policy.xml $HOME/.config/ImageMagick + sudo rm -f /etc/ImageMagick-6/policy.xml # workaround + - name: Build + run: | + cmake . + make + - name: Run tests + run: | + pushd "${GITHUB_WORKSPACE}/test" + ./run_tests.sh + popd From b1d1d337527c8ddc1d72b08b6a8209308e88fe0a Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 19:54:33 +0200 Subject: [PATCH 03/11] try without sudo --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f2684c..0bf2e99 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v2 - name: Install dependencies run: | - sudo apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev git make ghostscript cmake + apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev git make ghostscript cmake pip install pyyaml requests mkdir -p $HOME/.config/ImageMagick cp test/policy.xml $HOME/.config/ImageMagick From ac8b7038647ce3539bfe027e2176bc47591348a4 Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 20:00:36 +0200 Subject: [PATCH 04/11] try with apt-get update --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0bf2e99..45acdb3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,8 @@ jobs: - uses: actions/checkout@v2 - name: Install dependencies run: | - apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev git make ghostscript cmake + apt-get update -qq + apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev make ghostscript cmake pip install pyyaml requests mkdir -p $HOME/.config/ImageMagick cp test/policy.xml $HOME/.config/ImageMagick From ae1b2c1dfd84f30cbff64693fbc3af2ad8cd4b78 Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 20:04:59 +0200 Subject: [PATCH 05/11] try with pip --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 45acdb3..646b428 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - name: Install dependencies run: | apt-get update -qq - apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev make ghostscript cmake + apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev make ghostscript cmake pip pip install pyyaml requests mkdir -p $HOME/.config/ImageMagick cp test/policy.xml $HOME/.config/ImageMagick From d5ae93a4a91cf0f5e63fb001810d11e98559308c Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 20:09:48 +0200 Subject: [PATCH 06/11] another sudo to remove --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 646b428..3de6171 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: pip install pyyaml requests mkdir -p $HOME/.config/ImageMagick cp test/policy.xml $HOME/.config/ImageMagick - sudo rm -f /etc/ImageMagick-6/policy.xml # workaround + rm -f /etc/ImageMagick-6/policy.xml # workaround - name: Build run: | cmake . From 97d69c4f15c0fdc9eab233ce2adfb5870248dfc2 Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 20:19:03 +0200 Subject: [PATCH 07/11] try without pushd and popd --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3de6171..a1bce99 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,6 @@ jobs: make - name: Run tests run: | - pushd "${GITHUB_WORKSPACE}/test" + cd "${GITHUB_WORKSPACE}/test" ./run_tests.sh - popd + cd - From ef5230b225ede8fc025474a49070a1077a228aaf Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 20:28:42 +0200 Subject: [PATCH 08/11] try without python --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a1bce99..db83fdc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - name: Install dependencies run: | apt-get update -qq - apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev make ghostscript cmake pip + apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev make ghostscript cmake pip python pip install pyyaml requests mkdir -p $HOME/.config/ImageMagick cp test/policy.xml $HOME/.config/ImageMagick From 79aed364baa1df132ecf93d4eda03c6224b3669e Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 21:35:32 +0200 Subject: [PATCH 09/11] try all python3 --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index db83fdc..8b7e826 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,8 +19,8 @@ jobs: - name: Install dependencies run: | apt-get update -qq - apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev make ghostscript cmake pip python - pip install pyyaml requests + apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev make ghostscript cmake python3 python3-pip + python3 -m pip install pyyaml requests mkdir -p $HOME/.config/ImageMagick cp test/policy.xml $HOME/.config/ImageMagick rm -f /etc/ImageMagick-6/policy.xml # workaround @@ -31,5 +31,6 @@ jobs: - name: Run tests run: | cd "${GITHUB_WORKSPACE}/test" + sed -i 's=/usr/bin/env python=/usr/bin/env python3=' tests.py ./run_tests.sh cd - From ce60038c3df4afbb8fb4c31e31143b072fcc98ce Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 21:54:00 +0200 Subject: [PATCH 10/11] try: replace --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8b7e826..3c33ebf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,6 +31,6 @@ jobs: - name: Run tests run: | cd "${GITHUB_WORKSPACE}/test" - sed -i 's=/usr/bin/env python=/usr/bin/env python3=' tests.py + sed -i 's=python =python3 =' run_tests.sh ./run_tests.sh cd - From cc544624d4c1ebf574ff18e46955fc54fdb4dec2 Mon Sep 17 00:00:00 2001 From: Pieter David Date: Fri, 24 Sep 2021 22:03:08 +0200 Subject: [PATCH 11/11] Install imagemagick --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c33ebf..e35b7bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: - name: Install dependencies run: | apt-get update -qq - apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev make ghostscript cmake python3 python3-pip + apt-get install -y libboost-dev libboost-filesystem-dev libboost-regex-dev libboost-system-dev make ghostscript cmake python3 python3-pip imagemagick python3 -m pip install pyyaml requests mkdir -p $HOME/.config/ImageMagick cp test/policy.xml $HOME/.config/ImageMagick