GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 01:35:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

switched the conan-config with/out branch statement

Browse Source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-06-21 10:37:37 +02:00 committed by Jelle Spijker
parent 4467491c36
commit c11865d1ca
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/conan-package-create.yml vendored
View File

@ -69,11 +69,11 @@ jobs:
key: ${{ runner.os }}-conan
- name: Get Conan configuration from branch
if: "${{ inputs.conan_config_branch == '' }}"
if: ${{ inputs.conan_config_branch != '' }}
run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}"
- name: Get Conan configuration
if: "${{ inputs.conan_config_branch != '' }}"
if: ${{ inputs.conan_config_branch == '' }}
run: conan config install https://github.com/Ultimaker/conan-config.git
- name: Create the Packages

10
.github/workflows/conan-recipe-export.yml vendored
View File

@ -67,23 +67,23 @@ jobs:
key: ${{ runner.os }}-conan
- name: Get Conan configuration from branch
if: "${{ inputs.conan_config_branch == '' }}"
if: ${{ inputs.conan_config_branch != '' }}
run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}"
- name: Get Conan configuration
if: "${{ inputs.conan_config_branch != '' }}"
if: ${{ inputs.conan_config_branch == '' }}
run: conan config install https://github.com/Ultimaker/conan-config.git
- name: Export the Package (binaries)
if: "${{ inputs.conan_export_binaries == 'true' }}"
if: ${{ inputs.conan_export_binaries == 'true' }}
run: conan export-pkg . ${{ inputs.recipe_id_full }}
- name: Export the Package
if: "${{ inputs.conan_export_binaries != 'true' }}"
if: ${{ inputs.conan_export_binaries != 'true' }}
run: conan export . ${{ inputs.recipe_id_full }}
- name: Create the latest alias
if: "${{ inputs.recipe_id_latest == '' }}"
if: ${{ inputs.recipe_id_latest == '' }}
run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }}
- name: Upload the Package(s)