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

Merge branch 'main' into CURA-9494_nightly

Browse source
This commit is contained in:
Jelle Spijker 2023-08-29 22:52:54 +02:00 • committed by GitHub
commit 81b2aeaf4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 331 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/linux.yml vendored
View file

@ -154,6 +154,11 @@ 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 --json "cura_inst/conan_install_info.json"
- name: Upload the Package(s)
if: always()
run: |
conan upload "*" -r cura --all -c
- name: Set Environment variables for Cura (bash)
run: |
. ./cura_inst/bin/activate_github_actions_env.sh

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

@ -154,6 +154,11 @@ 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 --json "cura_inst/conan_install_info.json"
- name: Upload the Package(s)
if: always()
run: |
conan upload "*" -r cura --all -c
- name: Set Environment variables for Cura (bash)
run: |
. ./cura_inst/bin/activate_github_actions_env.sh

2
.github/workflows/requirements-conan-package.txt vendored
View file

@ -1,2 +1,2 @@
conan==1.56.0
conan==1.60.2
sip

7
.github/workflows/windows.yml vendored
View file

@ -124,6 +124,11 @@ jobs:
- name: Create the Packages (Powershell)
run: conan install $Env:CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$Env:ENTERPRISE -o cura:staging=$Env:STAGING --json "cura_inst/conan_install_info.json"
- name: Upload the Package(s)
if: always()
run: |
conan upload "*" -r cura --all -c
- name: Set Environment variables for Cura (Powershell)
run: |
echo "${Env:WIX}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
@ -277,4 +282,4 @@ jobs:
success_body: "Installers for ${{ inputs.cura_conan_version }}"
failure_title: "Failed to create the Cura distributions"
failure_body: "Failed to create at least 1 installer for ${{ inputs.cura_conan_version }}"
secrets: inherit
secrets: inherit