3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-02-21 03:42:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'main' into CURA-10561-makerbot

Browse source 
# Conflicts:
#	conanfile.py
This commit is contained in:
Jelle Spijker 2023-10-28 08:24:27 +02:00
commit aaa8d0cf03
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
5 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/macos.yml vendored
View file

@ -158,8 +158,12 @@ jobs:
- name: Create the Packages (Bash)
run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING"
- name: Remove internal packages before uploading
run: |
conan remove "*@internal/*" -f || true
conan remove "cura_private_data*" -f || true
- name: Upload the Package(s)
if: ${{ inputs.operating_system != 'self-hosted' }}
run: |
conan upload "*" -r cura --all -c