GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-14 23:31:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean deps to make space for github actions

Browse Source 
revert to good hash for nlop
bugfix macos sed command
This commit is contained in:
supermerill 2020-01-10 17:27:08 +01:00
parent 7d95107793
commit f11b40ffe4
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/ccpp_mac.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: change date in version - 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 - name: mkdir in deps
run: mkdir deps/build run: mkdir deps/build
- name: cmake deps - name: cmake deps
@ -22,6 +22,9 @@ jobs:
- name: make deps - name: make deps
working-directory: ./deps/build working-directory: ./deps/build
run: make run: make
- name: clean deps
working-directory: ./deps/build
run: rm -rf dep_*
- name: mkdir build - name: mkdir build
run: mkdir build run: mkdir build
- name: cmake - name: cmake

3
.github/workflows/ccpp_ubuntu.yml vendored
View File

@ -24,6 +24,9 @@ jobs:
- name: make deps - name: make deps
working-directory: ./deps/build working-directory: ./deps/build
run: make run: make
- name: clean deps
working-directory: ./deps/build
run: rm -rf dep_*
- name: mkdir build - name: mkdir build
run: mkdir build run: mkdir build
- name: cmake - name: cmake

4
.github/workflows/ccpp_win.yml vendored
View File

@ -22,6 +22,10 @@ jobs:
run: | run: |
cmake .. -G "Visual Studio 16 2019" -A x64 cmake .. -G "Visual Studio 16 2019" -A x64
msbuild /m ALL_BUILD.vcxproj 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 - name: mkdir
run: mkdir build run: mkdir build
- name: cmake - name: cmake

3
deps/deps-windows.cmake vendored
View File

@ -134,7 +134,8 @@ ExternalProject_Add(dep_cereal
ExternalProject_Add(dep_nlopt ExternalProject_Add(dep_nlopt
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1
URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz" 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}" CMAKE_GENERATOR "${DEP_MSVC_GEN}"
# if (DEP_VS_VER MORE 15) # if (DEP_VS_VER MORE 15)
# CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" # CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"