Browse Source

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 <venv_path>/conan_install_info.json` to
the install command.

Contributes to CURA-9365
j.spijker@ultimaker.com 2 years ago
parent
commit
db8ec3994e
2 changed files with 2 additions and 2 deletions
  1. 1 1
      .github/workflows/cura-installer.yml
  2. 1 1
      conanfile.py

+ 1 - 1
.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' }}

+ 1 - 1
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: