From 612fa83d8ed3a057bd3a02d1d5956c0911a94327 Mon Sep 17 00:00:00 2001 From: Aymeric Stamm Date: Wed, 4 Oct 2023 16:15:40 +0200 Subject: [PATCH 1/2] Remove use of anima private from CI scripts. --- .github/workflows/build_all.yml | 8 +------- .github/workflows/build_macos.yml | 8 +------- .github/workflows/build_pr.yml | 2 +- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 5d5841ecc..d61437d74 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -24,14 +24,8 @@ jobs: - name: Install opengl run: sudo apt-get -y install libgl1-mesa-dev - - name: webfactory/ssh-agent - uses: webfactory/ssh-agent@v0.5.4 - with: - # Private SSH key to register in the SSH agent - ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON -DUSE_ANIMA_PRIVATE:BOOL=ON -DUSE_GITHUB_SSH:BOOL=ON + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 7db8f1c3c..84592b084 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -18,14 +18,8 @@ jobs: steps: - uses: actions/checkout@v2 - - name: webfactory/ssh-agent - uses: webfactory/ssh-agent@v0.5.4 - with: - # Private SSH key to register in the SSH agent - ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON -DUSE_ANIMA_PRIVATE:BOOL=ON -DUSE_GITHUB_SSH:BOOL=ON + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} diff --git a/.github/workflows/build_pr.yml b/.github/workflows/build_pr.yml index 04eca7b83..6a372c22f 100644 --- a/.github/workflows/build_pr.yml +++ b/.github/workflows/build_pr.yml @@ -25,7 +25,7 @@ jobs: run: sudo apt-get -y install libgl1-mesa-dev - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON -DUSE_ANIMA_PRIVATE:BOOL=OFF -DUSE_GITHUB_SSH:BOOL=OFF + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} From 2218462a89acee3ef370a1a06efc66497ec3272c Mon Sep 17 00:00:00 2001 From: Aymeric Stamm Date: Wed, 4 Oct 2023 16:16:06 +0200 Subject: [PATCH 2/2] Remove use of anima private in cmake files. --- CMakeLists.txt | 7 ------- superbuild/Anima_Private.cmake | 29 ----------------------------- superbuild/Boost.cmake | 2 +- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 superbuild/Anima_Private.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 18856f39e..30e9507b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,6 @@ option(USE_NLOPT "Build NLOPT dependencies" ON) option(BUILD_ANIMA_TOOLS "Build ANIMA tools" ON) option(BUILD_ANIMA_TESTING "Build ANIMA testing executables" OFF) option(BUILD_ANIMA_DOCUMENTATION "Build ANIMA doxygen" OFF) -option(USE_ANIMA_PRIVATE "Use ANIMA private part, requires authorized access" OFF) # Define default build type if needed if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) @@ -131,11 +130,6 @@ endif() include(Anima) -if (USE_ANIMA_PRIVATE) - set(USE_GITHUB_SSH ON CACHE BOOL "Use by default Git SSH addresses, requires public key set on github" FORCE) - include(Anima_Private) -endif() - configure_file(${CMAKE_SOURCE_DIR}/superbuild/BinariesPackaging.cmake.in ${CMAKE_BINARY_DIR}/BinariesPackaging.cmake @ONLY IMMEDIATE) @@ -143,6 +137,5 @@ configure_file(${CMAKE_SOURCE_DIR}/superbuild/BinariesPackaging.cmake.in add_custom_target(pack-binaries WORKING_DIRECTORY ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/BinariesPackaging.cmake - DEPENDS Anima_Private COMMENT "-- Generating binary packages" ) diff --git a/superbuild/Anima_Private.cmake b/superbuild/Anima_Private.cmake deleted file mode 100644 index 5f16a1312..000000000 --- a/superbuild/Anima_Private.cmake +++ /dev/null @@ -1,29 +0,0 @@ -set (proj Anima_Private) - -set (cmake_args - ${common_cache_args} - -DANIMA_DIR:PATH=${Anima_BUILD_DIR} - -DEXECUTABLE_OUTPUT_PATH=${CMAKE_BINARY_DIR}/bin - -DLIBRARY_OUTPUT_PATH=${CMAKE_BINARY_DIR}/lib - -DBUILD_TOOLS:BOOL=${BUILD_ANIMA_TOOLS} - -DBUILD_TESTING:BOOL=${BUILD_ANIMA_TESTING} - -DBUILD_DOCUMENTATION:BOOL=${BUILD_ANIMA_DOCUMENTATION} - ) - -set (location "") -if (NOT DEFINED ${proj}_SRC_DIR) - set(location GIT_REPOSITORY ${GITHUB_PREFIX}Inria-Empenn/Anima.git GIT_TAG origin/master) -endif() - -ExternalProject_Add(${proj} - ${location} - DEPENDS Anima - PREFIX ${CMAKE_BINARY_DIR}/${proj} - SOURCE_DIR ${CMAKE_SOURCE_DIR}/${proj} - CMAKE_GENERATOR ${cmake_gen} - CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM} - CMAKE_ARGS ${cmake_args} - BUILD_ALWAYS 1 - BINARY_DIR ${CMAKE_BINARY_DIR}/${proj} - INSTALL_COMMAND "" - ) diff --git a/superbuild/Boost.cmake b/superbuild/Boost.cmake index c59b4026c..43275c42a 100644 --- a/superbuild/Boost.cmake +++ b/superbuild/Boost.cmake @@ -2,7 +2,7 @@ set (proj Boost) set (location "") if (NOT DEFINED ${proj}_SRC_DIR) - set(location URL http://freefr.dl.sourceforge.net/project/boost/boost/1.74.0/boost_1_74_0.tar.gz) + set(location URL https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.gz) endif() ExternalProject_Add(${proj}