From 4467491c36ff8a69916800baa87795dc83e4cb48 Mon Sep 17 00:00:00 2001
From: "j.spijker@ultimaker.com" <jelle spijker>
Date: Tue, 21 Jun 2022 10:23:38 +0200
Subject: [PATCH] Move the Conan cache step before in conan-config install

It looks like the new conan configuration isn't applied, the
ordering of the cache might influence this. At the very least
it doens't hurt to do this step at the beginning of the workflow

Contributes to CURA-9365
---
 .github/workflows/conan-package-create.yml | 16 ++++++++--------
 .github/workflows/conan-recipe-export.yml  | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml
index 8aebf5e3e6..3706e4f97c 100644
--- a/.github/workflows/conan-package-create.yml
+++ b/.github/workflows/conan-package-create.yml
@@ -52,14 +52,6 @@ jobs:
                     pip install -r .github/workflows/requirements-conan-package.txt
                     conan profile new default --detect
 
-            -   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 }}"
-
-            -   name: Get Conan configuration
-                if: "${{ inputs.conan_config_branch != '' }}"
-                run: conan config install https://github.com/Ultimaker/conan-config.git
-
             -   name: Cache Conan local repository packages (Bash)
                 uses: actions/cache@v3
                 if: ${{ runner.os != 'Windows' }}
@@ -76,6 +68,14 @@ jobs:
                         C:\.conan
                     key: ${{ runner.os }}-conan
 
+            -   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 }}"
+
+            -   name: Get Conan configuration
+                if: "${{ inputs.conan_config_branch != '' }}"
+                run: conan config install https://github.com/Ultimaker/conan-config.git
+
             -   name: Create the Packages
                 run: conan install ${{ inputs.recipe_id_full }} -pr:b cura_build.jinja -pr:h cura_release.jinja --build=missing --update
 
diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml
index 32278d781b..70837d6eb8 100644
--- a/.github/workflows/conan-recipe-export.yml
+++ b/.github/workflows/conan-recipe-export.yml
@@ -60,6 +60,12 @@ jobs:
                     pip install -r .github/workflows/requirements-conan-package.txt
                     conan profile new default --detect
 
+            -   name: Cache Conan local repository packages
+                uses: actions/cache@v3
+                with:
+                    path: $HOME/.conan/data
+                    key: ${{ runner.os }}-conan
+
             -   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 }}"
@@ -68,12 +74,6 @@ jobs:
                 if: "${{ inputs.conan_config_branch != '' }}"
                 run: conan config install https://github.com/Ultimaker/conan-config.git
 
-            -   name: Cache Conan local repository packages
-                uses: actions/cache@v3
-                with:
-                    path: $HOME/.conan/data
-                    key: ${{ runner.os }}-conan
-
             -   name: Export the Package (binaries)
                 if: "${{ inputs.conan_export_binaries == 'true' }}"
                 run: conan export-pkg . ${{ inputs.recipe_id_full }}