GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-14 18:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

CICD for deps (#2342)

Browse Source
This commit is contained in:
SoftFever 2023-10-07 20:38:53 +08:00 committed by GitHub
commit 449405f2b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/build_deps.yml vendored
View File

@ -25,12 +25,12 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
# - os: ubuntu-22.04 - os: ubuntu-20.04
- os: windows-latest - os: windows-latest
# - os: macos-12 - os: macos-12
# arch: x86_64 arch: x86_64
# - os: macos-12 - os: macos-12
# arch: arm64 arch: arm64
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
@ -82,7 +82,7 @@ jobs:
./build_release_macos.sh -dp -a arm64 ./build_release_macos.sh -dp -a arm64
- name: Build on Ubuntu - name: Build on Ubuntu
if: matrix.os == 'ubuntu-22.04' if: matrix.os == 'ubuntu-20.04'
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
sudo apt-get update sudo apt-get update
@ -119,7 +119,7 @@ jobs:
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
- name: Upload Ubuntu artifacts - name: Upload Ubuntu artifacts
if: matrix.os == 'ubuntu-22.04' if: matrix.os == 'ubuntu-20.04'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: OrcaSlicer_dep_ubuntu_${{ env.date }} name: OrcaSlicer_dep_ubuntu_${{ env.date }}

2
BuildLinux.sh
View File

@ -178,7 +178,7 @@ then
# make deps # make deps
echo "[4/9] Building dependencies..." echo "[4/9] Building dependencies..."
make -j$NCORES make deps -j$NCORES
echo "done" echo "done"
# rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this? # rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this?

1
deps/CURL/CURL.cmake vendored
View File

@ -65,6 +65,7 @@ orcaslicer_add_cmake_project(CURL
# ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/curl-mods.patch # ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/curl-mods.patch
CMAKE_ARGS CMAKE_ARGS
-DBUILD_TESTING:BOOL=OFF -DBUILD_TESTING:BOOL=OFF
-DBUILD_CURL_EXE:BOOL=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCURL_STATICLIB=${_curl_static} -DCURL_STATICLIB=${_curl_static}
${_curl_platform_flags} ${_curl_platform_flags}

2
deps/GMP/GMP.cmake vendored
View File

@ -57,7 +57,7 @@ else ()
endif () endif ()
ExternalProject_Add(dep_GMP ExternalProject_Add(dep_GMP
URL https://gmplib.org/download/gmp/gmp-6.2.1.tar.bz2 URL https://github.com/SoftFever/OrcaSlicer_deps/releases/download/gmp-6.2.1/gmp-6.2.1.tar.bz2
URL_HASH SHA256=eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c URL_HASH SHA256=eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP
BUILD_IN_SOURCE ON BUILD_IN_SOURCE ON