From c11865d1ca4efe0aca69d0e461b1f97b2b45ae53 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 21 Jun 2022 10:37:37 +0200 Subject: [PATCH] switched the conan-config with/out branch statement Contributes to CURA-9365 --- .github/workflows/conan-package-create.yml | 4 ++-- .github/workflows/conan-recipe-export.yml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 3706e4f97c..436ae308d4 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -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 diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml index 70837d6eb8..32c92cb02e 100644 --- a/.github/workflows/conan-recipe-export.yml +++ b/.github/workflows/conan-recipe-export.yml @@ -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)