From 09a52d93d6f106f96c6cdc0a583c25d07f2e79a1 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <j.spijker@ultimaker.com>
Date: Thu, 16 Jun 2022 06:23:05 +0200
Subject: [PATCH] Revert "Allow for a bool to only build from local cache"

This reverts commit e1fcca3d9cf6f40859cafb7875d9fed93ebcfaf0.
---
 .github/workflows/conan-package-create.yml | 16 ++--------------
 .github/workflows/conan-recipe-export.yml  | 12 +++---------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml
index 0f11ea7385..e5b43f4329 100644
--- a/.github/workflows/conan-package-create.yml
+++ b/.github/workflows/conan-package-create.yml
@@ -23,11 +23,6 @@ on:
                 required: false
                 type: string
 
-            # FIXME: Once we have the new JFrog server up and running
-            conan_no_update:
-                required: false
-                type: boolean
-
 env:
     CONAN_LOGIN_USERNAME_ULTIMAKER: ${{ secrets.CONAN_USER }}
     CONAN_PASSWORD_ULTIMAKER: ${{ secrets.CONAN_PASS }}
@@ -56,11 +51,11 @@ jobs:
                     conan profile new default --detect
 
             -   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: Cache Conan local repository packages (Bash)
@@ -80,14 +75,7 @@ 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
                 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' }}
-                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
                 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..7a23698d22 100644
--- a/.github/workflows/conan-recipe-export.yml
+++ b/.github/workflows/conan-recipe-export.yml
@@ -27,11 +27,6 @@ on:
                 required: false
                 type: string
 
-            # FIXME: Once we have the new JFrog server up and running
-            conan_no_update:
-                required: false
-                type: boolean
-
 env:
     CONAN_LOGIN_USERNAME_ULTIMAKER: ${{ secrets.CONAN_USER }}
     CONAN_PASSWORD_ULTIMAKER: ${{ secrets.CONAN_PASS }}
@@ -60,11 +55,11 @@ jobs:
                     conan profile new default --detect
 
             -   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: Cache Conan local repository packages
@@ -77,9 +72,8 @@ jobs:
                 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)
-                if: ${{ inputs.conan_no_update == 'true' }}  # FIXME: Once we have the new JFrog server up and running
                 run: conan upload "*" -r ultimaker --all -c