3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
31339 commits 312 branches 275 tags 718 MiB
Commit graph

472 commits

Author SHA1 Message Date
Jelle Spijker
48ea4cee9f Merge branch '5.2' 
# Conflicts:
#	conanfile.py
 2022-10-10 10:23:01 +02:00
Jaime van Kessel
3bb448c483
Merge pull request #13480 from Ultimaker/PP-260-notify-on-print-profile-change 
Notify PP&M on Print Profile Change
 2022-10-06 10:29:52 +02:00
Joey de l'Arago
1f7679b331
Default to creating the installer 2022-10-06 10:01:06 +02:00
Rijk van Manen
d6d7eef054 Notify PP&M on Print Profile Change 
To avoid print profile changes for ultimaker printers going unnoticed a github action is set up.
PP-260
 2022-10-05 14:55:49 +02:00
Jelle Spijker
6a03ae9e9c Use run-name to show version and actor 
New functionality which should help clarify which run is which.

https://github.blog/changelog/2022-09-26-github-actions-dynamic-names-for-workflow-runs/
 2022-10-05 07:43:25 +02:00
jspijker
c00135bfac make sure prerelease tag triggers conan-package 2022-10-04 16:36:13 +02:00
jelle Spijker
9ef927d747 Fix bump up version 2022-10-04 13:38:19 +02:00
jelle Spijker
c98614e2e1 Fix release is pushed to branch and not tagged 2022-10-04 13:11:07 +02:00
jelle Spijker
95faab7eb9 Fix release is pushed to branch and not tagged 2022-10-04 12:58:45 +02:00
jelle Spijker
328cff594a Also bump up version after beta release 2022-10-04 12:36:10 +02:00
jelle Spijker
01357dd7fe PR's a tagged with 5.3.0-alpha 2022-10-04 12:01:08 +02:00
jelle Spijker
3dd2d146e7 Make sure a tag is a release version 2022-10-04 12:00:09 +02:00
Joey de l'Arago
d505e6980c
Update conan-recipe-version.yml 2022-09-30 13:49:45 +02:00
Joey de l'Arago
3d2f6bbfe4
Update conan-recipe-version.yml 2022-09-30 13:47:50 +02:00
Joey de l'Arago
d7db09d96d
Update conan-recipe-version.yml 2022-09-30 13:46:02 +02:00
Joey de l'Arago
51b3c338da
Update conan-recipe-version.yml 2022-09-30 13:44:36 +02:00
Joey de l'Arago
c4f4900ccd
Revert Later 
This is a hack for beta release
 2022-09-30 13:39:07 +02:00
Alex
7e218bef8b build: harden conan-package.yml permissions 
Signed-off-by: Alex <aleksandrosansan@gmail.com>
 2022-09-23 13:22:49 +02:00
Alex
6213c95bbc build: harden unit-test.yml permissions 
Signed-off-by: Alex <aleksandrosansan@gmail.com>
 2022-09-23 13:11:23 +02:00
Remco Burema
a1b826c03c Versioning fix: Patch was not reset when minor was bumped. 2022-09-16 09:28:42 +02:00
Remco Burema
d69819a24e Merge remote-tracking branch 'origin/5.1' 2022-09-13 19:47:07 +02:00
Jelle Spijker
d31cc5baf0
fix channel_metadata not defined 2022-09-12 18:32:09 +02:00
j.spijker@ultimaker.com
2244b50c6e fix latest branch version prerelease 2022-09-12 09:09:14 +02:00
Jelle Spijker
6d8ac37766
fixed typo 2022-09-12 09:03:21 +02:00
jelle Spijker
6f0627ea48 Fix versioning scheme name used by embedded team 2022-09-12 08:58:46 +02:00
Jelle Spijker
01e3823d4d Bump minor version on main 2022-09-07 17:09:59 +02:00
Jelle Spijker
5f2256f2d9
allow conan 1.52.0 to be used 2022-09-06 17:33:09 +02:00
jelle Spijker
cc403a9a49 Bump up patch version on release branch 2022-09-06 15:38:42 +02:00
j.spijker@ultimaker.com
2086bbfc49 Use workflow fixes from main 2022-09-06 15:25:18 +02:00
j.spijker@ultimaker.com
7eb47d450f Also use gcc12 for the unittest 
in case curaengine isn't build
 2022-09-06 13:00:45 +02:00
j.spijker@ultimaker.com
bc7db5ffa7 Always run 2022-09-06 13:00:44 +02:00
Jelle Spijker
871e442a2e
Don't use conan 1.52.0 
Fails on Windows in the `MSBuildDeps` generator.

Looks like a bug in Conan raised an issue conan-io/conan#12023
 2022-09-05 11:34:57 +02:00
jelle Spijker
3f02a96b33 don't use no_commits 2022-09-01 12:15:21 +02:00
jellespijker
e59aa8e22b temporary fix for external PR 2022-09-01 12:13:31 +02:00
j.spijker@ultimaker.com
03c6686f7d Only run create package on our pr 2022-09-01 12:02:33 +02:00
jellespijker
76466b776a Use different checkout scheme based on forked repo 2022-09-01 12:00:07 +02:00
j.spijker@ultimaker.com
df0179ef58 define it as inputs 2022-09-01 10:26:02 +02:00
jellespijker
046985270a Add optional input is_external_pr 2022-09-01 09:51:46 +02:00
jellespijker
2385b00af3 Fixes external PR version 
Differentiate between internal actions and those of PR's

This should fix the failing unit tests on forked PR
 2022-09-01 09:33:23 +02:00
Remco Burema
0063867b4b Fix github workflow for packages on 'modern linux'. 2022-08-24 16:42:40 +02:00
Remco Burema
72e67de978 Fix github workflow for packages on 'modern linux'. 2022-08-24 16:21:02 +02:00
joeydelarago
21878058eb Fix prerelease string assignment 2022-08-22 17:08:55 +02:00
joeydelarago
e073adfa9e Fix conditional in recipe versioning to use proper syntax 2022-08-22 17:02:53 +02:00
Casper Lamboo
2dbb9ac32f
Merge pull request #13040 from Ultimaker/CURA-9272_semver_postfix 
[CURA-9272] Semver postfix
 2022-08-22 16:43:36 +02:00
j.spijker@ultimaker.com
32c30faf6a Use the latest SIP 
Contributes to CURA-8788
 2022-08-22 11:58:37 +02:00
joeydelarago
1f701c267a Merge branch 'main' into CURA-9272_semver_postfix 2022-08-22 09:04:03 +02:00
Joey de l'Arago
6f6c2df28a
Update requirements-conan-package.txt 2022-08-19 14:45:42 +02:00
joeydelarago
4667373cb4 Fix recipes not being uploaded to community conan repository. These booleans were strings because of a github runners bug, but that bug is fixed now so these changes are being reverted. 2022-08-15 17:17:40 +02:00
joeydelarago
5900cac9c8 Default the prerelease number to 1 when it is not set in the github tags. 
CURA-9272
 2022-08-15 16:00:14 +02:00
j.spijker@ultimaker.com
05ea26a8cf Don't use conan 1.51.2 
Contributes to CURA-9528
 2022-08-12 10:40:21 +02:00