3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'main' into CURA-11482_sentry

Browse source
This commit is contained in:
Jelle Spijker 2024-01-11 15:05:06 +01:00
commit 7874dbf9d6
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
conanfile.py
View file

@ -518,7 +518,8 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV
del self.info.options.cloud_api_version
del self.info.options.display_name
del self.info.options.cura_debug_mode
self.options.rm_safe("enable_i18n")
if self.options.get_safe("enable_i18n", False):
del self.info.options.enable_i18n
# TODO: Use the hash of requirements.txt and requirements-ultimaker.txt, Because changing these will actually result in a different
# Cura. This is needed because the requirements.txt aren't managed by Conan and therefor not resolved in the package_id. This isn't