3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 20:57:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34356 commits 306 branches 270 tags 779 MiB
Commit graph

763 commits

Author SHA1 Message Date
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 0d4a879632)
 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
Casper Lamboo
13167bf30b
Remove gitpython from conan requirements 2022-07-14 08:53:40 +02:00
Jelle Spijker
7dc378fb4c
remove reference to curaengine 
copy-paste left over
 2022-07-13 19:31:01 +02:00
Jelle Spijker
0adfe59b93
Make sure gitpython is installed 2022-07-13 19:00:07 +02:00
Jelle Spijker
8492b2f11f
Use workflow from main 2022-07-13 18:57:46 +02:00
Jelle Spijker
771856fd60
Use workflow from main 2022-07-13 18:56:24 +02:00
Jelle Spijker
0140c2a601
allow copy to fail 2022-07-13 18:53:06 +02:00
j.spijker@ultimaker.com
6b31e6a776 Split up OpenSSL install and copy 
Contributes to CURA-9365
 2022-07-13 16:32:18 +02:00
c.lamboo
d18bbfbfc7 Revert "Attempt to fix tests" 
This reverts commit ba5f4fa290.
 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
j.spijker@ultimaker.com
81aa56c259 Explicitly build and copy OpenSSL shared OS specific 
Contributes to CURA-9365
 2022-07-13 15:27:57 +02:00
j.spijker@ultimaker.com
ce018da48f Explicitly build and copy OpenSSL shared 
This is a workaround to ensure that we use and pack a shared library for OpenSSL 1.1.1l.
We currently compile OpenSSL statically for CPython, but our Python Dependenies (such as
PyQt6) require a shared library. Because Conan won't allow for building the same library
with two different options (easily) we need to install it explicitly and do a manual copy
to the VirtualEnv, such that Pyinstaller can find it.

Contributes to CURA-9365
 2022-07-13 15:01:26 +02:00
Casper Lamboo
91a830ab06
Fix version number matching 2022-07-13 11:35:07 +02:00
c.lamboo
2a2945bcfe Attempt to fix tests 
Remove `gitpython` from requirements-conan-package.txt and install it manually instead
 2022-07-13 09:25:16 +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
j.spijker@ultimaker.com
51da6ca87b remove single quotes 
Contributes to CURA-9365
 2022-07-12 11:49:39 +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
8ae326d7a5 use the job outputs 
Contributes to CURA-9365
 2022-07-12 11:45:55 +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
b3c60eb34b Get correct issue number from PR 
Contributes to CURA-9365
 2022-07-12 11:35:08 +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
Jaime van Kessel
ecee9181b9
Merge pull request #12736 from Ultimaker/CURA-9205_appimage_not_launching_on_ubuntu_2204 
Cura 9205 appimage not launching on ubuntu 2204
 2022-07-12 11:19:45 +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
2263407856 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:06 +02:00
j.spijker@ultimaker.com
cf9482218f fix typo 
Contributes to CURA-9365
 2022-07-12 11:11:26 +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
fcc1a38e3f Use the latest prerelease but count from the latest stable 
Contributes to CURA-9365
 2022-07-12 11:08:22 +02:00
j.spijker@ultimaker.com
5dd1798979 Use the input for the project name 
Contributes to CURA-9365
 2022-07-12 11:04:11 +02:00
j.spijker@ultimaker.com
fbf49221b5 Count from the latest stable release 
Contributes to CURA-9365
 2022-07-12 11:04:11 +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
ba1e4eb39f use the first index 
Contributes to CURA-9365
 2022-07-12 10:58:25 +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
36c4c56abb 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:05 +02:00
j.spijker@ultimaker.com
479679b018 Also add libegl-dev to Linux system req 
Contributes to CURA-9205
 2022-07-11 12:04:15 +02:00