Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated build scripts for macOS and Linus and fix for mainframe.cpp #4363

Open
wants to merge 11 commits into
base: nightly_dev
Choose a base branch
from
Open

updated build scripts for macOS and Linus and fix for mainframe.cpp #4363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a40b7ba
Fix support interface: Don't confuse the first support layer with raf…
supermerill Jul 3, 2024
7c0a696
fix crash (seam), support bot. int. angle. occtwrapper on linux.
supermerill Jul 3, 2024
28825b3
only start manually
wschadow Jul 3, 2024
9717a86
adds a file
wschadow Jul 3, 2024
bb1e81e
includes .mo files, some updates to build files
wschadow Jul 4, 2024
69bf6c4
Merge branch 'nightly_dev' of github.com:Caribou3d/SuperSlicer into n…
wschadow Jul 4, 2024
71c3997
Merge remote-tracking branch 'upstream/nightly_dev' into nightly_dev
wschadow Jul 4, 2024
22fd2fd
Merge remote-tracking branch 'upstream/nightly_dev' into nightly_dev
wschadow Jul 8, 2024
c0b65fd
updated build scripts for macOS and Linux
wschadow Jul 8, 2024
a681c41
updates build scripts
wschadow Jul 8, 2024
c4f91f6
corrected braces and formatting
wschadow Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/workflows/ccpp_mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
name: C/C++ Nightly macos

on:
push:
branches:
- Nigthly
- nightly_dev
- nightly_master
- debug_macos
workflow_dispatch:

jobs:
build:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/ccpp_mac_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
name: C/C++ Nightly arm macos

on:
push:
branches:
- Nigthly
- nightly_dev
- nightly_master
- debug_macos
workflow_dispatch:

jobs:
build:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ccpp_mac_arm_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: C/C++ debug arm macos

on:
push:
branches:
- debug_macos
workflow_dispatch:

jobs:
build:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ccpp_mac_arm_rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: C/C++ Release candidate arm macos

on:
push:
branches:
- rc
workflow_dispatch:

jobs:
build:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ccpp_mac_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: C/C++ debug macos

on:
push:
branches:
- debug_macos
workflow_dispatch:

jobs:
build:
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ccpp_mac_rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
name: C/C++ Release candidate macos

on:
push:
branches:
- rc
- debug_macos
workflow_dispatch:

jobs:
build:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/ccpp_ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
name: C/C++ Nightly ubuntu

on:
push:
branches:
- Nigthly
- nightly_dev
- nightly_master
- debug_ubuntu
workflow_dispatch:

jobs:
build:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ccpp_ubuntu_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: C/C++ debug ubuntu

on:
push:
branches:
- debug_ubuntu
workflow_dispatch:

jobs:
build:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/ccpp_ubuntu_gtk3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
name: C/C++ Nightly ubuntu-GTK3

on:
push:
branches:
- Nigthly
- nightly_dev
- nightly_master
- debug_ubuntu
workflow_dispatch:

jobs:
build:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/ccpp_ubuntu_gtk3_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: C/C++ debug ubuntu-GTK3

on:
push:
branches:
- debug_ubuntu
workflow_dispatch:

jobs:
build:
Expand Down Expand Up @@ -47,4 +45,4 @@ jobs:
with:
name: ${{ github.event.repository.name }}-gtk3.AppImage
path: build/${{ github.event.repository.name }}_ubu64.AppImage

4 changes: 1 addition & 3 deletions .github/workflows/ccpp_ubuntu_gtk3_rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: C/C++ Release candidate ubuntu-GTK3

on:
push:
branches:
- rc
workflow_dispatch:

jobs:
build:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ccpp_ubuntu_rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: C/C++ Release candidate ubuntu

on:
push:
branches:
- rc
workflow_dispatch:

jobs:
build:
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/ccpp_win.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
name: C/C++ Nightly windows x64

on:
push:
branches:
- Nigthly
- nightly_dev
- nightly_master
workflow_dispatch:

jobs:

build:
runs-on: windows-2019

steps:
- uses: actions/checkout@v1
- uses: ilammy/msvc-dev-cmd@v1
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/ccpp_win_debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
name: C/C++ debug windows x64

on:
push:
branches:
- debug_win
workflow_dispatch:

jobs:

build_pot:
runs-on: windows-2019

steps:
- uses: actions/checkout@v1
- uses: ilammy/msvc-dev-cmd@v1
Expand Down Expand Up @@ -77,7 +75,7 @@ jobs:
build:
runs-on: windows-2019
needs: build_dep

steps:
- uses: actions/checkout@v1
- uses: ilammy/msvc-dev-cmd@v1
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/ccpp_win_deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
name: C/C++ dep build windows x64

on:
push:
branches:
- debug_win
workflow_dispatch:

jobs:
build_dep:
Expand All @@ -28,7 +26,7 @@ jobs:
build:
runs-on: windows-2019
needs: build_dep

steps:
- uses: actions/checkout@v1
- uses: ilammy/msvc-dev-cmd@v1
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/ccpp_win_rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
name: C/C++ Release candidate windows x64

on:
push:
branches:
- rc
workflow_dispatch:

jobs:

build:
runs-on: windows-2019

steps:
- uses: actions/checkout@v1
- uses: ilammy/msvc-dev-cmd@v1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ local-lib
build*
deps/build*
deps/deps-*
cmake/CPackConfig.cmake

# MacOS Ignores
.DS_Store
Expand Down
Loading