GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 04:49:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,303 Commits 295 Branches 268 Tags
Commit Graph

29303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
j.spijker@ultimaker.com
95c1a03cb5 pin fm_materials and cura_binary_data 
Contributes to CURA-9365
 2022-06-22 14:24:27 +02:00
j.delarago
dd3abf7ff0 Add check for empty material instance containers before trying to fetch material metadata. This fixes failing to save a project on a printer with no materials (UM2 for example). 
CURA-9412
 2022-06-22 14:05:56 +02:00
j.spijker@ultimaker.com
cc814afaa3 don't use prereleasenumber 
Contributes to CURA-9365
 2022-06-22 13:21:40 +02:00
j.spijker@ultimaker.com
0b9a49f7c9 Trigger on release branch and when gitversion changes 
Contributes to CURA-9365
 2022-06-22 12:28:12 +02:00
Jelle Spijker
be5ed20f8f Use Conan download cache 
to limit to amount of transfer to/from server

Contributes to CURA-9365
 2022-06-22 11:14:07 +02:00
j.spijker@ultimaker.com
803858c4e9 Cheating with Arcus 
Contributes to CURA-9365
 2022-06-22 11:04:12 +02:00
j.spijker@ultimaker.com
46929ad302 Invert failure bool for notify 
Contributes to CURA-9365
 2022-06-22 10:51:51 +02:00
j.spijker@ultimaker.com
fdbac4cccb trigger workflow when conanfile.py and conandata.yml changes 
Contributes to CURA-9365
 2022-06-22 09:29:58 +02:00
j.spijker@ultimaker.com
ee87a2e3a4 use umbase 0.1.1 or higher 
Contributes to CURA-9365
 2022-06-22 09:28:52 +02:00
j.spijker@ultimaker.com
6ca96814a8 Fix parser logic 
Contributes to CURA-9365
 2022-06-22 08:57:02 +02:00
j.spijker@ultimaker.com
4c4c6bb5da fixed latest step 
Contributes to CURA-9365
 2022-06-22 08:52:46 +02:00
j.spijker@ultimaker.com
f746708c8e fix typo 
Contributes to CURA-9365
 2022-06-22 08:48:34 +02:00
j.spijker@ultimaker.com
a80543aa4c use only semver pre-release-tags 
Contributes to CURA-9365
 2022-06-22 08:46:06 +02:00
j.spijker@ultimaker.com
399bff8bf6 Remove reference to curaengine from step name 
Contributes to CURA-9365
 2022-06-22 08:04:10 +02:00
j.spijker@ultimaker.com
24f1170c29 treat input success and failure as boolean 
Contributes to CURA-9365
 2022-06-22 08:02:19 +02:00
j.spijker@ultimaker.com
5616bae098 Cache to arch specific key 
Contributes to CURA-9365
 2022-06-22 06:58:26 +02:00
j.spijker@ultimaker.com
c135173e67 No need to sanitize user 
Contributes to CURA-9365
 2022-06-21 17:14:42 +02:00
j.spijker@ultimaker.com
73c3bd2126 Remove release branch trigger 
Contributes to CURA-9365
 2022-06-21 17:09:12 +02:00
j.spijker@ultimaker.com
955cf56dc3 Use glob pattern for the release triggers 
Contributes to CURA-9365
 2022-06-21 17:04:06 +02:00
j.spijker@ultimaker.com
1c23bb56d1 No start and end characters for regex 
Contributes to CURA-9365
 2022-06-21 16:58:23 +02:00
j.spijker@ultimaker.com
cef1e35190 Uniform Versions 
Contributes to CURA-9365
 2022-06-21 16:52:32 +02:00
j.spijker@ultimaker.com
d987c0190b Treat the input as a boolean not a string 
Contributes to CURA-9365
 2022-06-21 14:41:37 +02:00
j.spijker@ultimaker.com
117534f091 Put value between quotes 
Contributes to CURA-9365
 2022-06-21 14:16:14 +02:00
j.spijker@ultimaker.com
f9a3ff01c8 Always upload to Artifactory 
The dependencies might have been build,
no need to rebuild them

Contributes to CURA-9365
 2022-06-21 14:08:50 +02:00
j.spijker@ultimaker.com
b1a12cb70f Allow for cleaning of the cache 
Handy bool if we evr downloaded an incomplete conan-package

Contributes to CURA-9365
 2022-06-21 13:48:29 +02:00
j.spijker@ultimaker.com
1c0f5e8a64 Add conan-package system reqs 
for Linux and Macos

Contributes to CURA-9365
 2022-06-21 13:42:06 +02:00
j.spijker@ultimaker.com
4c6985b0d9 sanitized and lowercased the prerelease tag 
Cura won't show the full prerelease tag in the splash screen
if there is a `-` in it. also versioning should all be
lowercase.

Contributes to CURA-9365
 2022-06-21 13:19:30 +02:00
Ghostkeeper
1142768d59
Fix headers for translation files 
And update their dates too.

Contributes to issue CURA-9420.
 2022-06-21 13:12:21 +02:00
j.spijker@ultimaker.com
e2a3b1ad15 Remove old workflows 
Contributes to CURA-9365
 2022-06-21 13:06:22 +02:00
j.spijker@ultimaker.com
ff8c0414da Also run workflow when reussable workflow changes 
Contributes to CURA-9365
 2022-06-21 13:02:52 +02:00
Ghostkeeper
7898d8e5bf
Update translation files from updated templates 
This brings the new translated strings into the files for each language.

Contributes to issue CURA-9420.
 2022-06-21 12:56:04 +02:00
Ghostkeeper
de968d6c16
Update translation templates for Cura 5.1 
These are the new translations for 5.1.

Contributes to issue CURA-9420.
 2022-06-21 12:54:08 +02:00
j.spijker@ultimaker.com
c7aa3c3762 run the no-response job twice a day 
Contributes to CURA-9365
 2022-06-21 11:38:18 +02:00
Jaime van Kessel
52ea80f6c9 Fix the font for searchbars being styled correctly 
By setting the font.italic to true, we actually reset the entire font.

Fixes #12565
 2022-06-21 10:58:53 +02:00
j.spijker@ultimaker.com
c61ecfa00e Also run workflow when reussable workflow changes 
Contributes to CURA-9365
 2022-06-21 10:39:13 +02:00
j.spijker@ultimaker.com
c11865d1ca switched the conan-config with/out branch statement 
Contributes to CURA-9365
 2022-06-21 10:37:37 +02:00
j.spijker@ultimaker.com
4467491c36 Move the Conan cache step before in conan-config install 
It looks like the new conan configuration isn't applied, the
ordering of the cache might influence this. At the very least
it doens't hurt to do this step at the beginning of the workflow

Contributes to CURA-9365
 2022-06-21 10:23:38 +02:00
j.spijker@ultimaker.com
2f95fd2616 Remove old CI workflow 
No longer relevant or needed

Contributes to CURA-9365
 2022-06-21 10:19:25 +02:00
j.spijker@ultimaker.com
227b106927 Use the new JFrog Artifactory server 
Only upload binaries to cura repo,
the cura-ce should contain only recipes and sources

Contributes to CURA-9365
 2022-06-21 10:15:43 +02:00
Jelle Spijker
6d509e1094 Revert "Workaround for no remote atm" 
This reverts commit 215f487978c354335f67fe4b4f1175651b7a5719.
 2022-06-21 09:56:15 +02:00
j.spijker@ultimaker.com
0ced137432 Also trigger workflow on changing runner pip req 
Contributes to CURA-9365
 2022-06-21 09:52:59 +02:00
j.spijker@ultimaker.com
57e991e214 Add runner pip requirements 
Contributes to CURA-9365
 2022-06-21 09:50:58 +02:00
Jelle Spijker
cd12d24584 Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building_cura_main 2022-06-21 07:52:58 +02:00
j.spijker@ultimaker.com
d275ad37f8 Remove user and channel 
Even though we had to patch these recipes, the user/channel
shouldn't be necesary any more because of the order in which
our remotes are defined in the conan-config repo. It will
first look into our own remotes, before going over to
conan-center-index.

Once the packages upstream are fixed for us, then we can use
the conan-center-index packages again, without changing the
code.

Contributes to CURA-9365
 2022-06-21 07:52:27 +02:00
Ghostkeeper
8970f46154
Better path to packages.json in the 3MF file 
Let's put it in the Cura directory with the rest of such files, as to not muddy the 3MF file with all sorts of directories that are not known to other consumers.

Contributes to issue CURA-9413.
 2022-06-20 11:04:14 +02:00
Ghostkeeper
d1747e09e1
Fix link to help page when material package is missing 
In this case we don't want to link to Ultimaker's internal help pages, but to the public support pages.
 2022-06-20 10:48:13 +02:00
j.spijker@ultimaker.com
a31124673b Compile libffi and mpdecimal statically on Windows 
Contributes to CURA-9365
 2022-06-19 19:08:24 +02:00
j.spijker@ultimaker.com
0fb8d62825 Use patched recipes for cpython, mpdecimal, tk, tcl 
Once upstream recipes are fixed these can be removed again.
export the changes for now
```
# Export patched conan-center-index recipes, I will open PR's for all of those
git clone https://github.com/jellespijker/conan-center-index.git
pushd .
cd conan-center-index

git checkout fix_tcl_recipe_env_info
conan export recipes/tcl/all tcl/8.6.10@ultimaker/testing

git checkout fix_tk_recipe_env_info
conan export recipes/tk/all tk/8.6.10@ultimaker/testing

git checkout fix_mpdecimale_recipe_not_use_msys
conan export recipes/mpdecimal/2.5.x mpdecimal/2.5.1@ultimaker/testing

git checkout add_3_10_4_version_cpython
conan export recipes/cpython/all cpython/3.10.4@ultimaker/testing
```

Contributes to CURA-9365
 2022-06-19 14:59:36 +02:00
j.spijker@ultimaker.com
05191af96f set mpdecimal cxx option to false on windows 
the combination of compiling it shared and with cxx is invalid
on Windows. We don't use the cxx capabilities of mpdecimal

Contributes to CURA-9365
 2022-06-19 14:34:26 +02:00
j.spijker@ultimaker.com
74bd183869 Use cpython 3.10.4 
See branch in fork conan-center-index
https://github.com/jellespijker/conan-center-index/tree/add_3_10_4_version_cpython

Contributes to CURA-9365
 2022-06-19 14:03:16 +02:00