From 9d690da9d5c254225981efa4e200b504e9abb40b Mon Sep 17 00:00:00 2001
From: jspijker <j.spijker@ultimaker.com>
Date: Sun, 13 Nov 2022 10:29:25 +0100
Subject: [PATCH] Fix buildinfo.json generation

---
 .github/workflows/conan-package-create.yml | 14 +++++++++++---
 .github/workflows/conan-package.yml        |  4 +++-
 .github/workflows/conan-recipe-version.yml |  4 ++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml
index 5f781dfb00..673212f488 100644
--- a/.github/workflows/conan-package-create.yml
+++ b/.github/workflows/conan-package-create.yml
@@ -11,6 +11,14 @@ on:
                 required: true
                 type: number
 
+            recipe_user:
+                required: true
+                type: string
+
+            recipe_channel:
+                required: true
+                type: string
+
             recipe_id_full:
                 required: true
                 type: string
@@ -140,12 +148,12 @@ jobs:
                 if: ${{ inputs.conan_config_branch == '' }}
                 run: conan config install https://github.com/Ultimaker/conan-config.git
 
-            -   name: Create the Packages
+            -   name: Create the Packages and the buildinfo.json
                 if: ${{ !inputs.create_from_source }}
                 run: |
                     conan_build_info --v2 start ${{ inputs.project_name }} ${{ github.run_number }}000${{ inputs.build_id }}
-                    conan lock create --reference ${{ inputs.recipe_id_full }} --build=missing --update
-                    conan install ${{ inputs.recipe_id_full }} --build=missing --update --lockfile=conan.lock
+                    conan lock create --reference ${{ inputs.recipe_id_full }} --user=${{ inputs.recipe_user }} --channel=${{ inputs.recipe_channel }} --lockfile-out=conan.lock
+                    conan install ${{ inputs.recipe_id_full }} --build=missing --update --lockfile=conan.lock --lockfile-out=conan.lock
                     conan_build_info --v2 create buildinfo.json --lockfile conan.lock --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }}
                     conan_build_info --v2 publish buildinfo.json --url https://ultimaker.jfrog.io/artifactory --user ${{ secrets.CONAN_USER }} --password ${{ secrets.CONAN_PASS }}
                     conan_build_info --v2 stop
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
index 0a3d4447c1..9dd0d7cfe2 100644
--- a/.github/workflows/conan-package.yml
+++ b/.github/workflows/conan-package.yml
@@ -81,8 +81,10 @@ jobs:
 
         uses: ultimaker/cura/.github/workflows/conan-package-create.yml@main
         with:
-            project_name: cura
+            project_name: ${{ needs.conan-recipe-version.outputs.recipe_projectname }}
             build_id: 1
+            recipe_user: ${{ needs.conan-recipe-version.outputs.recipe_user }}
+            recipe_channel: ${{ needs.conan-recipe-version.outputs.recipe_channel }}
             recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
             runs_on: 'ubuntu-20.04'
             python_version: '3.10.x'
diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml
index eb1824c8f7..b832b94784 100644
--- a/.github/workflows/conan-recipe-version.yml
+++ b/.github/workflows/conan-recipe-version.yml
@@ -37,6 +37,10 @@ on:
                 description: "The conan channel"
                 value: ${{ jobs.get-semver.outputs.channel }}
 
+            recipe_projectname:
+                description: "The conan projectname"
+                value: ${{ inputs.project_name }}
+
 jobs:
     get-semver: