Skip to content

Commit

Permalink
CICD for deps (#2342)
Browse files Browse the repository at this point in the history
  • Loading branch information
SoftFever authored Oct 7, 2023
2 parents cd17209 + 95311f9 commit 449405f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build_deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
fail-fast: false
matrix:
include:
# - os: ubuntu-22.04
- os: ubuntu-20.04
- os: windows-latest
# - os: macos-12
# arch: x86_64
# - os: macos-12
# arch: arm64
- os: macos-12
arch: x86_64
- os: macos-12
arch: arm64
runs-on: ${{ matrix.os }}

steps:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
./build_release_macos.sh -dp -a arm64
- name: Build on Ubuntu
if: matrix.os == 'ubuntu-22.04'
if: matrix.os == 'ubuntu-20.04'
working-directory: ${{ github.workspace }}
run: |
sudo apt-get update
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep

- name: Upload Ubuntu artifacts
if: matrix.os == 'ubuntu-22.04'
if: matrix.os == 'ubuntu-20.04'
uses: actions/upload-artifact@v3
with:
name: OrcaSlicer_dep_ubuntu_${{ env.date }}
Expand Down
2 changes: 1 addition & 1 deletion BuildLinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ then

# make deps
echo "[4/9] Building dependencies..."
make -j$NCORES
make deps -j$NCORES
echo "done"

# rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this?
Expand Down
1 change: 1 addition & 0 deletions deps/CURL/CURL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ orcaslicer_add_cmake_project(CURL
# ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/curl-mods.patch
CMAKE_ARGS
-DBUILD_TESTING:BOOL=OFF
-DBUILD_CURL_EXE:BOOL=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCURL_STATICLIB=${_curl_static}
${_curl_platform_flags}
Expand Down
2 changes: 1 addition & 1 deletion deps/GMP/GMP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ else ()
endif ()

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
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP
BUILD_IN_SOURCE ON
Expand Down

0 comments on commit 449405f

Please sign in to comment.