From 3c9541a6a9159c6c6b18b6dedde067ae7e8b5209 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 19 Jul 2022 06:57:42 +0200 Subject: [PATCH] Clean-up latest before creation and upload Contributes to CURA-9365 --- .github/workflows/conan-package-create.yml | 4 ---- .github/workflows/conan-recipe-export.yml | 14 +++++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index edfd6e5687..9377fa4ac5 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -92,10 +92,6 @@ jobs: if: ${{ runner.os == 'Linux' }} run: sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev -y - - name: Clean Conan local cache - if: ${{ inputs.conan_clean_local_cache }} - run: conan remove "*" -f - - name: Get Conan configuration from branch if: ${{ inputs.conan_config_branch != '' }} run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}" diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml index a53059f52a..7404acdc54 100644 --- a/.github/workflows/conan-recipe-export.yml +++ b/.github/workflows/conan-recipe-export.yml @@ -83,16 +83,16 @@ jobs: run: conan export-pkg . ${{ inputs.recipe_id_full }} - name: Export the Package - if: ${{ inputs.conan_export_binaries != 'true' && github.event_name != 'pull_request' }} + if: ${{ inputs.conan_export_binaries != 'true' }} run: conan export . ${{ inputs.recipe_id_full }} - name: Create the latest alias - if: ${{ inputs.recipe_id_latest != '' && github.event_name != 'pull_request' }} - run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} - - - name: Create the pull request alias - if: ${{ inputs.recipe_id_pr != '' && github.event_name == 'pull_request' }} - run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} + if: ${{ inputs.recipe_id_latest != '' }} + run: | + conan remove ${{ inputs.recipe_id_latest }} -f + conan remove ${{ inputs.recipe_id_latest }} -r cura -f + conan remove ${{ inputs.recipe_id_latest }} -r cura-ce -f + conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} - name: Upload the Package(s) run: |