From f11b40ffe4c235342f52eb9eb0b5174b311f76db Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 10 Jan 2020 17:27:08 +0100 Subject: [PATCH] clean deps to make space for github actions revert to good hash for nlop bugfix macos sed command --- .github/workflows/ccpp_mac.yml | 5 ++++- .github/workflows/ccpp_ubuntu.yml | 3 +++ .github/workflows/ccpp_win.yml | 4 ++++ deps/deps-windows.cmake | 3 ++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index d8bcd22ac..3fdce3b67 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: change date in version - run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc + run: sed "s/+UNKNOWN/_$(date '+%F')/" version.inc - name: mkdir in deps run: mkdir deps/build - name: cmake deps @@ -22,6 +22,9 @@ jobs: - name: make deps working-directory: ./deps/build run: make + - name: clean deps + working-directory: ./deps/build + run: rm -rf dep_* - name: mkdir build run: mkdir build - name: cmake diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml index 9559dd828..28c35021c 100644 --- a/.github/workflows/ccpp_ubuntu.yml +++ b/.github/workflows/ccpp_ubuntu.yml @@ -24,6 +24,9 @@ jobs: - name: make deps working-directory: ./deps/build run: make + - name: clean deps + working-directory: ./deps/build + run: rm -rf dep_* - name: mkdir build run: mkdir build - name: cmake diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml index 89eb95a00..e0f464fc1 100644 --- a/.github/workflows/ccpp_win.yml +++ b/.github/workflows/ccpp_win.yml @@ -22,6 +22,10 @@ jobs: run: | cmake .. -G "Visual Studio 16 2019" -A x64 msbuild /m ALL_BUILD.vcxproj + - name: clean deps + working-directory: ./deps/build + shell: cmd + run: for /d %G in ("./dep_*") do rmdir /S /Q "%~G" - name: mkdir run: mkdir build - name: cmake diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index cec2594b1..3f277122f 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -134,7 +134,8 @@ ExternalProject_Add(dep_cereal ExternalProject_Add(dep_nlopt EXCLUDE_FROM_ALL 1 URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz" - URL_HASH SHA256=c81bf6d981c328f3e634709dc84746e32ff5cfb715f698ead2de4d57e30a0e70 +# URL_HASH SHA256=c81bf6d981c328f3e634709dc84746e32ff5cfb715f698ead2de4d57e30a0e70 + URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae CMAKE_GENERATOR "${DEP_MSVC_GEN}" # if (DEP_VS_VER MORE 15) # CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"