From d45f65d4003215a3da49f51275bdbb332268226d Mon Sep 17 00:00:00 2001 From: jspijker Date: Tue, 28 Feb 2023 14:11:17 +0100 Subject: [PATCH] Always remove upload latest --- .github/workflows/conan-package.yml | 8 ++++---- .github/workflows/conan-recipe-export.yml | 12 ++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index d3d75610ee6..a7137debab7 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -122,19 +122,19 @@ jobs: - name: Get Conan configuration run: conan config install https://github.com/Ultimaker/conan-config.git - - name: Create the Packages using lockfile + - name: Create the Packages run: conan create . ${{ needs.conan-recipe-version.outputs.recipe_id_full }} --build=missing --update -o ${{ needs.conan-recipe-version.outputs.project_name }}:devtools=True - name: Remove the latest alias - if: always() && ${{ needs.conan-recipe-version.outputs.recipe_id_latest != '' }} + if: always() run: conan remove ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura -f - name: Remove the latest alias from cura-ce - if: always() && ${{ needs.conan-recipe-version.outputs.recipe_id_latest != '' }} + if: always() run: conan remove ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} -r cura-ce -f - name: Create the latest alias - if: always() && ${{ needs.conan-recipe-version.outputs.recipe_id_latest != '' }} + if: always() run: conan alias ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - name: Upload the Package(s) diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml index 483fc9154a7..9bab7c6bb50 100644 --- a/.github/workflows/conan-recipe-export.yml +++ b/.github/workflows/conan-recipe-export.yml @@ -89,19 +89,15 @@ jobs: run: conan export . ${{ inputs.recipe_id_full }} - name: Remove the latest alias - if: always() && ${{ inputs.recipe_id_latest != '' && runner.os == 'Linux' }} + if: always() run: conan remove ${{ inputs.recipe_id_latest }} -r cura -f - name: Remove the latest alias from cura-ce - if: always() && ${{ inputs.recipe_id_latest != '' && runner.os == 'Linux' }} + if: always() run: conan remove ${{ inputs.recipe_id_latest }} -r cura-ce -f - name: Create the latest alias - if: always() && ${{ inputs.recipe_id_latest != '' && runner.os == 'Linux' }} - run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} - - - name: Create the latest alias - if: always() && ${{ inputs.recipe_id_latest != '' }} + if: always() run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} - name: Upload the Package(s) @@ -109,5 +105,5 @@ jobs: run: conan upload "*" -r cura --all -c - name: Upload the Package(s) community - if: always() && ${{ inputs.conan_upload_community == true }} + if: ${{ inputs.conan_upload_community && always() }} run: conan upload "*" -r cura-ce -c