From 50db1fbb620a50a33205db10e62246d0f494b26a Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 18 Aug 2023 21:33:39 +0200 Subject: [PATCH 1/2] Set arch for X64 Contributes to CURA-8415 --- .github/workflows/macos.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c9ac1dd159..e27a3b679f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -124,7 +124,9 @@ jobs: - name: Get Conan configuration 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) run: | From 1dddb9ff89ad7caf8a3c7e90a65bf4934a4742d7 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 18 Aug 2023 21:36:44 +0200 Subject: [PATCH 2/2] use string for workflow call Contributes to CURA-8415 --- .github/workflows/macos.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e27a3b679f..bc59eb27c1 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -57,11 +57,8 @@ on: architecture: description: 'Architecture' required: true - default: 'x64' - type: choice - options: - - x64 - - arm64 + default: 'X64' + type: string env: CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}