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

402 Commits

Author SHA1 Message Date
j.spijker@ultimaker.com
0397a95381 Use new cache location 
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
 2022-07-19 08:36:03 +02:00
j.spijker@ultimaker.com
3b1de601d4 Use new cache location 
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365

(cherry picked from commit 03285f80fc51c47e6ac96c24b85aa4ebf99251c1)
 2022-07-19 08:28:07 +02:00
j.spijker@ultimaker.com
03285f80fc Use new cache location 
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
 2022-07-19 08:26:49 +02:00
j.spijker@ultimaker.com
9569e33b52 Use new cache location 
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
 2022-07-19 08:03:45 +02:00
jspijker
d73aa62d6f Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 
# Conflicts:
#	conandata.yml
 2022-07-19 07:54:32 +02:00
j.spijker@ultimaker.com
cf77f9073e Fixed wrong context 
Contributes to CURA-9365
 2022-07-19 07:50:34 +02:00
j.spijker@ultimaker.com
68fd824ee3 fixed typo 
Contributes to CURA-9365
 2022-07-19 07:48:42 +02:00
j.spijker@ultimaker.com
1253adf31c Only remove alias on Linux 
Contributes to CURA-9365
 2022-07-19 07:46:56 +02:00
j.spijker@ultimaker.com
fe8686438d Only upload ultimaker and _ to artifactory 
Contributes to CURA-9365
 2022-07-19 07:45:17 +02:00
j.spijker@ultimaker.com
be361366b3 treat it as a boolean 
Contributes to CURA-9365
 2022-07-19 07:39:41 +02:00
j.spijker@ultimaker.com
788606cb51 Only remove the binaries with pure export step 
Contributes to CURA-9365
 2022-07-19 07:36:57 +02:00
j.spijker@ultimaker.com
0b7fe4790b Allow remove alias to fail 
Contributes to CURA-9365
 2022-07-19 07:29:24 +02:00
j.spijker@ultimaker.com
34fccedd03 Only remove remote aliases 
Contributes to CURA-9365
 2022-07-19 07:02:29 +02:00
j.spijker@ultimaker.com
3c9541a6a9 Clean-up latest before creation and upload 
Contributes to CURA-9365
 2022-07-19 06:57:42 +02:00
j.spijker@ultimaker.com
4e55603bde Set channel and user to _ for tag 
Contributes to CURA-9365
 2022-07-19 06:50:39 +02:00
Ghostkeeper
aeae08645b
Merge branch '5.1' 
Conflicts:
	conandata.yml -> something was added in 5.1, so I kept that. Not sure why it'd be a conflict.
 2022-07-18 10:58:17 +02:00
j.spijker@ultimaker.com
798facd63b Add pkg-config to Linux system reqs 
Is needed to build CPython and it wasn't installed

Contributes to CURA-9342
 2022-07-18 10:01:24 +02:00
Jelle Spijker
5dbef74e22 Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-15 15:46:10 +02:00
Jelle Spijker
b969764c1c Merge branch '5.1' into CURA-8665_add_prerelease_tag_to_install_dir 2022-07-15 14:22:19 +02:00
Jelle Spijker
298181abc6 Revert "Limit the number of commits to checkout to 3000" 
This reverts commit 0793572dc32182053a6b7534b803aac42a7fa063.
 2022-07-15 13:57:49 +02:00
Jelle Spijker
e179e15f4a Merge branch '5.1' 
# Conflicts:
#	.github/workflows/unit-test.yml
 2022-07-15 13:53:13 +02:00
j.spijker@ultimaker.com
0793572dc3 Limit the number of commits to checkout to 3000 
Should speed up this workflow

Seems like a reasonable number (for Cura) at the
time of writing that would include up until 4.13.1

Contributes to CURA-9459
 2022-07-15 13:52:21 +02:00
j.spijker@ultimaker.com
c01410146d Checkout the repo, needed by setup python 
Contributes to CURA-9459
 2022-07-15 13:44:12 +02:00
j.spijker@ultimaker.com
b2531c851f Run unit tests as a composite action 
To avoid conflicts between the Cura Python modules and the
EnricoMi/publish-unit-test-result-action

Contributes to CURA-9459
 2022-07-15 13:39:36 +02:00
j.spijker@ultimaker.com
d1385a809a Fix buildmetadata containing stable 
Contributes to CURA-9365
 2022-07-15 11:53:51 +02:00
j.spijker@ultimaker.com
7568a897a0 Fix wrong indention 
Contributes to CURA-9365
 2022-07-15 11:15:07 +02:00
j.spijker@ultimaker.com
bb69e4877a Add channel to build metadata on non-release branches 
Contributes to CURA-9365
 2022-07-15 11:11:38 +02:00
Jelle Spijker
c731ac7dfe Merge branch '5.1' into CURA-9459_standard_default_install_path 
# Conflicts:
#	conandata.yml
 2022-07-15 10:33:04 +02:00
Jelle Spijker
3def77416d Merge branch '5.1' 2022-07-15 10:04:26 +02:00
j.spijker@ultimaker.com
a0d775b90e Update workflows 
Contributes to CURA-9365
 2022-07-15 10:03:37 +02:00
j.spijker@ultimaker.com
17748d0a9a print boolean to lower case 
Contributes to CURA-9365
 2022-07-15 09:07:37 +02:00
j.spijker@ultimaker.com
a75596f97c bool is_release_branch added 
Contributes to CURA-9365
 2022-07-15 08:58:09 +02:00
j.spijker@ultimaker.com
2b808daa4e Add major_minor output for easier release branch detection 
Contributes to CURA-9365
 2022-07-15 08:34:30 +02:00
Jelle Spijker
363f65211e Merge branch '5.1' into CURA-9459_standard_default_install_path 2022-07-15 07:56:26 +02:00
Jelle Spijker
4093e1e808
Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-14 17:39:28 +02:00
Jelle Spijker
1a0ecfd850
Merge branch '5.1' 
# Conflicts:
#	.github/workflows/conan-package.yml
#	.github/workflows/cura-installer.yml
 2022-07-14 16:30:52 +02:00
j.spijker@ultimaker.com
e0c7259149
Notify on success 
Contributes to CURA-9365
 2022-07-14 16:28:08 +02:00
j.spijker@ultimaker.com
77979c384d
Lowercase username 
Contributes to CURA-9365

(cherry picked from commit f5a559179bac2e638e62c6a41adf22dcb3ec3bdf)
 2022-07-14 15:47:24 +02:00
j.spijker@ultimaker.com
f5a559179b
Lowercase username 
Contributes to CURA-9365
 2022-07-14 14:55:54 +02:00
j.spijker@ultimaker.com
409c079d8f
Simplified nsis script 
Contributes to CURA-9365
 2022-07-14 14:47:58 +02:00
j.spijker@ultimaker.com
95a8de45ee
Use testing channel as a default 
Contributes to CURA-9365
 2022-07-14 10:40:23 +02:00
j.spijker@ultimaker.com
7068c87130
Add copied openssl 1.1.1l binaries to pyinstall binaries 
Contributes to CURA-9342
 2022-07-14 10:38:59 +02:00
j.spijker@ultimaker.com
bc54bbe28e
Shorten description 
Contributes to CURA-9365
 2022-07-14 09:27:00 +02:00
j.spijker@ultimaker.com
57a0c214d1
Add option for additional conan install args 
Contributes to CURA-9365
 2022-07-14 09:25:24 +02:00
j.spijker@ultimaker.com
7f1e17b820
Add option for additional conan install args 
Contributes to CURA-9365

(cherry picked from commit 0d4a8796328769a57746248cc8449eb56882d4c6)
 2022-07-14 09:25:05 +02:00
j.spijker@ultimaker.com
0d4a879632
Add option for additional conan install args 
Contributes to CURA-9365
 2022-07-14 09:24:32 +02:00
Jelle Spijker
9cb8e4d742
Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library 2022-07-14 09:20:42 +02:00
j.spijker@ultimaker.com
94bedf2a1c
Use ref_name when a tag is pushed 
Contributes to CURA-9365
 2022-07-14 09:19:39 +02:00
j.spijker@ultimaker.com
b3cc3818b5
various fixes to workflow 
Contributes to CURA-9365
 2022-07-14 09:18:37 +02:00
j.spijker@ultimaker.com
62ea4f3a48
Updated branches in workflows 
Contributes to CURA-9365
 2022-07-14 09:12:51 +02:00