From db8ec3994ef2ae6a531110bdc147120e874b8c58 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Wed, 6 Jul 2022 13:54:44 +0200 Subject: [PATCH] Add conan_install_info.json to the builds Should help with debugging, We could maybe even use it later on to update the about page and/or logs If you want to create a package you should also pass the `--json /conan_install_info.json` to the install command. Contributes to CURA-9365 --- .github/workflows/cura-installer.yml | 2 +- conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 020092ad89..9a26bcb344 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -139,7 +139,7 @@ jobs: run: conan config install https://github.com/Ultimaker/conan-config.git - name: Create the Packages - run: conan install ${{ inputs.cura_conan_version }} --build=missing --update -c tools.env.virtualenv:powershell=True -if cura_inst -g VirtualPythonEnv -o cura:enterprise=${{ inputs.enterprise }} -o cura:staging=${{ inputs.staging }} + run: conan install ${{ inputs.cura_conan_version }} --build=missing --update -c tools.env.virtualenv:powershell=True -if cura_inst -g VirtualPythonEnv -o cura:enterprise=${{ inputs.enterprise }} -o cura:staging=${{ inputs.staging }} -json "cura_inst/conan_install_info.json" - name: Set Environment variables for Cura (bash) if: ${{ runner.os != 'Windows' }} diff --git a/conanfile.py b/conanfile.py index a4f389fa89..c60d8b221c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -139,7 +139,7 @@ class CuraConan(ConanFile): def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file): pyinstaller_metadata = self._um_data(self.version)["pyinstaller"] - datas = [] + datas = [(self._base_dir.joinpath("conan_install_info.json", "."))] for data in pyinstaller_metadata["datas"].values(): if "package" in data: # get the paths from conan package if data["package"] == self.name: