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

29580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Casper Lamboo
13167bf30b
Remove gitpython from conan requirements 2022-07-14 08:53:40 +02:00
Jelle Spijker
0adfe59b93
Make sure gitpython is installed 2022-07-13 19:00:07 +02:00
c.lamboo
d18bbfbfc7 Revert "Attempt to fix tests" 
This reverts commit ba5f4fa29076e72938f076404c26b06ba40dab7a.
 2022-07-13 15:41:13 +02:00
c.lamboo
ba5f4fa290 Attempt to fix tests 
Remove `gitpython` from requirements-conan-package.txt and install it manually instead
 2022-07-13 15:38:58 +02:00
Joey de l'Arago
f80e0425a7
Merge pull request #12708 from Ultimaker/CURA-9365 
Introduce Conan, JFrog and GitHub Actions to build and manage Cura (and her dependencies
 2022-07-13 14:05:33 +02:00
Joey de l'Arago
c66ea0a5a5
Merge branch 'main' into CURA-9365 2022-07-13 14:05:08 +02:00
Casper Lamboo
91a830ab06
Fix version number matching 2022-07-13 11:35:07 +02:00
Casper Lamboo
596bfe8a37
Fix version number matching 2022-07-13 11:28:09 +02:00
Jelle Spijker
56659ce8f8
Update .gitignore 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-07-12 14:09:55 +02:00
Jelle Spijker
550d4b8256
Update .github/workflows/unit-test.yml 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-07-12 14:06:59 +02:00
Jelle Spijker
4fdd78eff2
Update .github/workflows/unit-test.yml 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-07-12 14:06:42 +02:00
Jelle Spijker
7aebfac30b
Update .github/workflows/unit-test.yml 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-07-12 14:06:10 +02:00
Jelle Spijker
69913053ec
Update .github/workflows/conan-package.yml 
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
 2022-07-12 13:57:11 +02:00
Casper Lamboo
bedcb8b2ab
Delete fix_app_qt_folder_names_for_codesign.py 2022-07-12 13:42:21 +02:00
Jaime van Kessel
c3b5653d5e
Merge pull request #12748 from lacgondi/main 
Fix minor spelling mistakes in README.md
 2022-07-12 12:58:35 +02:00
László Gondi
72a29a99a3 Fix minor spelling in README.md 
Changed "out" to "our" in the Configuring Cura and Translating Cura sections.
 2022-07-12 12:24:22 +02:00
j.spijker@ultimaker.com
80c3a1d735 remove single quotes 
Contributes to CURA-9365
 2022-07-12 11:49:06 +02:00
j.spijker@ultimaker.com
b56b65ab3d use the job outputs 
Contributes to CURA-9365
 2022-07-12 11:45:20 +02:00
j.spijker@ultimaker.com
6c4e85b85c Get correct issue number from PR 
Contributes to CURA-9365
 2022-07-12 11:32:04 +02:00
j.spijker@ultimaker.com
15c67719ed Count from latest tag 
This can result in a strange versioning compared
to the previous 5.1.0 beta,

but it will only be cosmetic

Contributes to CURA-9365
 2022-07-12 11:16:22 +02:00
j.spijker@ultimaker.com
52636dc81d fix typo 
Contributes to CURA-9365
 2022-07-12 11:10:55 +02:00
j.spijker@ultimaker.com
90336ce08e Use the latest prerelease but count from the latest stable 
Contributes to CURA-9365
 2022-07-12 11:08:45 +02:00
j.spijker@ultimaker.com
0a000a756e Use the input for the project name 
Contributes to CURA-9365
 2022-07-12 11:03:52 +02:00
j.spijker@ultimaker.com
a1c39c7537 Count from the latest stable release 
Contributes to CURA-9365
 2022-07-12 11:02:48 +02:00
j.spijker@ultimaker.com
4fd744cc95 use the first index 
Contributes to CURA-9365
 2022-07-12 10:58:07 +02:00
j.spijker@ultimaker.com
43d9174d95 Use custom versioning system 
We already had to customize to much, it isn't worth
the effort to continue with GitVersion

The script still has some issues when a tag is pushed

Contributes to CURA-9365
 2022-07-12 10:55:47 +02:00
j.spijker@ultimaker.com
613d397c2e Don't run with the conan config for powershell 
Contributes to CURA-9365
 2022-07-08 18:57:46 +02:00
j.spijker@ultimaker.com
b482b4d60c sync requirements with Uranium 
Contributes to CURA-9365
 2022-07-08 17:11:25 +02:00
j.spijker@ultimaker.com
e82cc1c9a5 Add 5.1.0-alpha 
Same config as beta

Once merged to main we should bump up the Version in GitVersion
And set this to use the correct requirements

Contributes to CURA-9365
 2022-07-08 17:00:47 +02:00
j.spijker@ultimaker.com
7e35a0eddb Remove buildmeta when PR 
Contributes to CURA-9365
 2022-07-08 16:51:12 +02:00
j.spijker@ultimaker.com
85d3bb1a3a Add pull_request against main branches 
FIXME:
A PR against a release branch will now get the alpha requirements out
of the conandata.yml

Contributes to CURA-9365
 2022-07-08 16:45:52 +02:00
j.spijker@ultimaker.com
ce686202a1 specify output name 
Contributes to CURA-9365
 2022-07-08 16:19:14 +02:00
j.spijker@ultimaker.com
4d501e8b7a Don't use _ for pr 
Contributes to CURA-9365
 2022-07-08 16:15:58 +02:00
j.spijker@ultimaker.com
0a1452dccb Simplified set-output for channel 
Contributes to CURA-9365
 2022-07-08 16:11:47 +02:00
j.spijker@ultimaker.com
1d3693cb1b Prepend pr_ for pull_request 
Contributes to CURA-9365
 2022-07-08 16:01:21 +02:00
j.spijker@ultimaker.com
5f12f1f43b Fix brackets 
Contributes to CURA-9365
 2022-07-08 15:56:36 +02:00
j.spijker@ultimaker.com
23234ea15f Fix for short branch names 
Contributes to CURA-9365
 2022-07-08 15:48:34 +02:00
j.spijker@ultimaker.com
6e46d357e5 Added missing closing braces 
Contributes to CURA-9365
 2022-07-08 15:42:29 +02:00
j.spijker@ultimaker.com
eb943f7f72 Added missing quote character 
Contributes to CURA-9365
 2022-07-08 15:41:22 +02:00
j.spijker@ultimaker.com
349eac5ca5 Use conan-recipe-version from CURA-9365 branch 
Contributes to CURA-9365
 2022-07-08 15:39:43 +02:00
j.spijker@ultimaker.com
f9b7d74050 Use full pr number 
Contributes to CURA-9365
 2022-07-08 15:37:18 +02:00
j.spijker@ultimaker.com
0d04f3e517 Remove pull request alias 
Contributes to CURA-9365
 2022-07-08 15:34:25 +02:00
j.spijker@ultimaker.com
70c4125742 sanitize versioning naming of pr events 
Contributes to CURA-9365
 2022-07-08 15:26:56 +02:00
j.spijker@ultimaker.com
cda4cdf66c Make release branch detection generic 
Contributes to CURA-9365
 2022-07-08 15:15:26 +02:00
jspijker
f9d4628b95 Merge branch 'main' into CURA-9365 
# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/cura-installer.yml
#	.github/workflows/requirements-conan-package.txt
#	resources/definitions/Mark2_for_Ultimaker2.def.json
#	resources/definitions/elegoo_neptune_2.def.json
#	resources/definitions/elegoo_neptune_2D.def.json
 2022-07-08 12:37:32 +02:00
j.spijker@ultimaker.com
8750c218db Added missing indirect pip requirements 
Contributes to CURA-9365
 2022-07-08 12:17:50 +02:00
j.spijker@ultimaker.com
8b5ed4b26b Downgrade urllib3 to 1.25.9 
to fix dependency conflict

Contributes to CURA-9365
 2022-07-08 12:07:04 +02:00
j.spijker@ultimaker.com
9b8f4b5ec9 Add twisted to requirements 
Contributes to CURA-9365
 2022-07-08 12:05:07 +02:00
j.spijker@ultimaker.com
ed02364809 Add requests to requirements 
Fixes #12696

Contributes to CURA-9365
 2022-07-08 12:05:07 +02:00
j.spijker@ultimaker.com
3cb58c6554 Updated conandata to run from main 
Note: This will work correctly when all the requirements
are also merged

Contributes to CURA-9365
 2022-07-08 12:05:07 +02:00