GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 07:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add conan_install_info.json to the builds

Browse Source 
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
This commit is contained in:
j.spijker@ultimaker.com 2022-07-06 13:54:44 +02:00 committed by Jelle Spijker
parent bfd1c6eea5
commit db8ec3994e
No known key found for this signature in database
GPG Key ID: 6662DC033BE6B99A
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cura-installer.yml vendored
View File

@ -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' }}

2
conanfile.py
View File

@ -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: