From ce790c9da971f28fc6c135d6890fc0c9e409afe2 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 16 Jun 2022 06:14:05 +0200 Subject: [PATCH] Allow for a bool to only build from local cache This is a workaround to allow further development of this Action until we have the JFrog server up and running. Contributes to CURA-9365 --- .github/workflows/conan-package-create.yml | 8 ++++---- .github/workflows/conan-recipe-export.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 0f11ea7385..3afc39a1eb 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -24,7 +24,7 @@ on: type: string # FIXME: Once we have the new JFrog server up and running - conan_no_update: + conan_update: required: false type: boolean @@ -80,14 +80,14 @@ jobs: key: ${{ runner.os }}-conan - name: Create the Packages - if: ${{ inputs.conan_no_update != 'true' }} # FIXME: Once we have the new JFrog server up and running + if: ${{ inputs.conan_update != 'false' }} # FIXME: Once we have the new JFrog server up and running run: conan install ${{ inputs.recipe_id_full }} -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update # FIXME: Once we have the new JFrog server up and running - name: Create the Packages - if: ${{ inputs.conan_no_update == 'true' }} + if: ${{ inputs.conan_update == 'false' }} run: conan install ${{ inputs.recipe_id_full }} -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing - name: Upload the Package(s) - if: ${{ inputs.conan_no_update == 'true' }} # FIXME: Once we have the new JFrog server up and running + if: ${{ inputs.conan_update != 'false' }} # FIXME: Once we have the new JFrog server up and running run: conan upload "*" -r ultimaker --all -c diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml index 4fdec08448..67f2493c62 100644 --- a/.github/workflows/conan-recipe-export.yml +++ b/.github/workflows/conan-recipe-export.yml @@ -28,7 +28,7 @@ on: type: string # FIXME: Once we have the new JFrog server up and running - conan_no_update: + conan_update: required: false type: boolean @@ -81,5 +81,5 @@ jobs: run: conan alias ${{ inputs.recipe_id_latest }} ${{ inputs.recipe_id_full }} - name: Upload the Package(s) - if: ${{ inputs.conan_no_update == 'true' }} # FIXME: Once we have the new JFrog server up and running + if: ${{ inputs.conan_update != 'false' }} # FIXME: Once we have the new JFrog server up and running run: conan upload "*" -r ultimaker --all -c