3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/main' into CURA-8415_self_hosted_runner

Browse source
This commit is contained in:
Jelle Spijker 2023-08-18 21:37:52 +02:00
commit a04ea3723e
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,11 +57,8 @@ on:
architecture: architecture:
description: 'Architecture' description: 'Architecture'
required: true required: true
default: 'x64' default: 'X64'
type: choice type: string
options:
- x64
- arm64
env: env:
CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
@ -124,7 +121,9 @@ jobs:
- name: Get Conan configuration - name: Get Conan configuration
run: conan config install https://github.com/Ultimaker/conan-config.git run: conan config install https://github.com/Ultimaker/conan-config.git
- name: - name: Set architecture conan profile
if: ${{ inputs.architecture == 'X64' }}
run: conan profile update settings.arch=x86_64 default
- name: Set Environment variables for Cura (bash) - name: Set Environment variables for Cura (bash)
run: | run: |