Skip to content

Commit

Permalink
update build script to supported github runner
Browse files Browse the repository at this point in the history
also using gmplib mirror
  • Loading branch information
supermerill committed Jul 9, 2023
1 parent d0bca0f commit 090fbee
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ccpp_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:

runs-on: macos-10.15
runs-on: macos-11

steps:
- uses: actions/checkout@v3
Expand All @@ -21,9 +21,9 @@ jobs:
uses: actions/upload-artifact@v1.0.0
with:
name: nightly_macos.tar
path: build/Slic3r.tar
path: build/${{ github.event.repository.name }}.tar
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
with:
name: nightly_macos.dmg
path: build/Slic3r.dmg
path: build/${{ github.event.repository.name }}.dmg
6 changes: 3 additions & 3 deletions .github/workflows/ccpp_mac_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:

runs-on: macos-latest
runs-on: macos-11

steps:
- uses: actions/checkout@v2
Expand All @@ -20,9 +20,9 @@ jobs:
uses: actions/upload-artifact@v1.0.0
with:
name: rc_macos.tar
path: build/Slic3r.tar
path: build/${{ github.event.repository.name }}.tar
- name: Upload artifact
uses: actions/upload-artifact@v1.0.0
with:
name: rc_macos.dmg
path: build/Slic3r.dmg
path: build/${{ github.event.repository.name }}.dmg
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_ubuntu_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_ubuntu_gtk3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_ubuntu_gtk3_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_ubuntu_gtk3_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

env:
EXEC_NAME: "${{ github.event.repository.name }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp_ubuntu_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions BuildLinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ then
echo -n -e "Updating linux ...\n"
hwclock -s
apt update
apt install g++ m4
if [[ -z "$FOUND_GTK3" ]]
then
echo -e "\nInstalling: libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
Expand Down
3 changes: 2 additions & 1 deletion deps/GMP/GMP.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ else ()
endif ()

ExternalProject_Add(dep_GMP
URL https://gmplib.org/download/gmp/gmp-6.2.1.tar.bz2
# URL https://gmplib.org/download/gmp/gmp-6.2.1.tar.bz2
URL https://github.com/supermerill/SuperSlicer_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 090fbee

Please sign in to comment.