33663 Commits

Author SHA1 Message Date
Jelle Spijker
704f128004
Use CURA-10831 working packages for deps
Contributes to CURA-10831
2023-12-05 10:15:51 +01:00
Jelle Spijker
8aa6d2c5b6
Update conan_data with actual version
Contributes to CURA-10831
2023-12-05 07:44:04 +01:00
Jelle Spijker
75089401c6
Merge branch 'main' into CURA-10831
# Conflicts:
#	conanfile.py
2023-12-05 07:20:10 +01:00
Jelle Spijker
b8d41abdee
Add FIXME reminder
Contributes to CURA-10831
2023-12-05 07:18:57 +01:00
Jelle Spijker
1334b65bdf
Post the unit test result on PR's
Contributes to CURA-10831
2023-12-05 07:17:21 +01:00
Jelle Spijker
f5354c058f
Add FIXME reminders
Contributes to CURA-10831
2023-12-05 07:08:36 +01:00
Jelle Spijker
86493b9c4d
Use VirtualPythonEnv generator
Contributes to CURA-10831
2023-12-05 06:05:21 +01:00
Jelle Spijker
e688a3a9df
use relative location of pytest
Somehow pytest can't be found on the PATH

Contributes to CURA-10831
2023-12-05 05:51:48 +01:00
Jelle Spijker
3dcf208d73
Revert "only run on main/release and PR's"
This reverts commit 6140d5ad145fb29a39f1ed0f7bb3f5e6468d1256.
2023-12-05 05:31:51 +01:00
Jelle Spijker
a2eb1dc085
Activate all activate_github_action envs
Contributes to CURA-10831
2023-12-05 05:30:57 +01:00
Jelle Spijker
6140d5ad14
only run on main/release and PR's
Contributes to CURA-10831
2023-12-05 05:06:40 +01:00
Jelle Spijker
a69e4f1678
set needs for testing job
Contributes to CURA-10831
2023-12-05 05:05:12 +01:00
Jelle Spijker
ad96082a16
Port unit-test to cura-workflows
Contributes to CURA-10831
2023-12-05 05:03:59 +01:00
Jelle Spijker
260a73e14c
Use older name for OS specific installer workflows
Contributes to CURA-10831
2023-12-04 19:51:11 +01:00
Jelle Spijker
b678951759
Applied work-around for GH true/false instead of True/False
Contributes to CURA-10831
2023-12-04 18:15:50 +01:00
Jelle Spijker
9ad993f8ca
Reinstate OS specific installer workflows
For those that wants to build a OS specific installer

Contributes to CURA-10831
2023-12-04 18:06:20 +01:00
Jelle Spijker
040f85c956
Remove redundant export workflow
Contributes to CURA-10831
2023-12-04 17:36:32 +01:00
saumya.jain
ce0cdd0b91 Model translations while changing build plates
while importing models, coordinate translations shouldn’t matter and the object should be organized on the plate where it finds space.

CURA-11166
2023-12-04 17:07:43 +01:00
Jelle Spijker
20ab319ec0
Use default values from cura-workflows
Contributes to CURA-10831
2023-12-04 16:31:50 +01:00
Jelle Spijker
e904123b80
Use Uranium CURA-11137
Contribute to CURA-11137
2023-12-04 14:41:46 +01:00
Jelle Spijker
832b3ea7e5
Merge branch 'CURA-10831' into CURA-11137_update_pyqt6
# Conflicts:
#	conanfile.py
2023-12-04 14:38:04 +01:00
Jelle Spijker
7a4d26452a
Fix testing against literal instead of value
Contribute to CURA-10831
2023-12-04 14:00:42 +01:00
Jelle Spijker
2d3ef87a47
Use the latest stable dulcificum build
Contribute to CURA-10831
2023-12-04 13:54:08 +01:00
c.lamboo
58c174ff68 pin dulcificum to 0.1.0-beta.2 2023-12-04 13:49:02 +01:00
c.lamboo
89be765841 Revert "unpin dulcificum"
This reverts commit ba9e122f6add419824e6fc03d55df40766d4e71d.
2023-12-04 13:48:05 +01:00
Jelle Spijker
7f1158c364
Use cura-workflow OS installers
Contribute to CURA-10831
2023-12-04 13:43:30 +01:00
c.lamboo
ba9e122f6a unpin dulcificum 2023-12-04 11:45:12 +01:00
Jelle Spijker
a0f161cd18
Merge branch 'main' into CURA-10831
# Conflicts:
#	conanfile.py
2023-12-04 11:05:10 +01:00
Saumya Jain
28f55e05fa
Merge branch 'main' into CURA-7647-play-simulation-time-dependent 2023-12-04 10:52:42 +01:00
Erwan MATHIEU
421f3ee5b5
Merge pull request #17488 from Ultimaker/CURA-11080_use_openssl_3
Cura 11080 use openssl 3
2023-12-04 10:45:41 +01:00
Jelle Spijker
b19d5d47d3
Use dulcificum 0.1.1-beta.0
Contributes to CURA-10831
2023-12-04 10:22:44 +01:00
Erwan MATHIEU
7d04a988b1
Merge branch 'main' into CURA-11080_use_openssl_3 2023-12-04 10:09:56 +01:00
jellespijker
bffbded591 Override spdlog version 2023-12-01 17:42:27 +01:00
jellespijker
4d97e779ed Use process-pull-request workflow
Contribute to CURA-10831
2023-12-01 16:18:44 +01:00
jellespijker
b847cf626b Use working CURA-10831 packages
Contribute to CURA-10831
2023-12-01 11:29:02 +01:00
jellespijker
806eba0c6b Merge remote-tracking branch 'origin/CURA-11080_use_openssl_3' into CURA-10831
# Conflicts:
#	conanfile.py
2023-12-01 11:27:05 +01:00
Jelle Spijker
31d48aabe7
Use Qt6.6 and PyQt6.6
Contributes to CURA-11137
2023-12-01 09:15:21 +01:00
Jelle Spijker
79c7db3e6f
Use Uranium workign branch CURA-11137
Contributes to CURA-10831 and CURA-11137
2023-12-01 08:13:30 +01:00
Jelle Spijker
afc8c04935
Merge branch 'CURA-11080_use_openssl_3' into CURA-11137_update_pyqt6 2023-12-01 08:08:21 +01:00
Jelle Spijker
10b69e801e
Openssl shared on Linux static for the rest
Contribute to CURA-11080
2023-12-01 07:51:31 +01:00
Jelle Spijker
b629669f77
Use sip<=6.7.12
6.8.0 seams to have bug which is botching up building pyArcus

Contribute to CURA-11080
2023-12-01 07:51:31 +01:00
c.lamboo
d93d66dd8a Use sentry cura engine version
CURA-11364
2023-11-30 13:45:21 +01:00
c.lamboo
1e190ebcb9 Format file
CURA-1364
2023-11-30 13:16:25 +01:00
Jelle Spijker
7573c3e994 Build OpenSSL 3 shared
No longer a need to deploy a shared dep
independently.

Contribute to CURA-11080
2023-11-30 12:58:47 +01:00
Jelle Spijker
ef5bc6d3d5 Use custom CPython 3.10.4 and OpenSSL 3.2.0
Due to changes made to the recipes up stream,
and some tweaks to our own cpython recipe.

We can now build cpython with the newest OpenSSL version

Contribute to CURA-11080
2023-11-30 12:57:14 +01:00
c.lamboo
b9f8ef9bc2 Merge branch 'main' into CURA-11364_add_sentry_engine 2023-11-30 11:02:46 +01:00
c.lamboo
29193d833c Revert "enable_sentry in install commands"
This reverts commit 2f452c6581ba11c3381b44ff1d5151fc56173687.
2023-11-30 11:01:51 +01:00
c.lamboo
d00c3fea78 Merge branch 'main' into CURA-11364_add_sentry_engine 2023-11-30 10:25:32 +01:00
c.lamboo
a87ad75edc Merge remote-tracking branch 'origin/main' 2023-11-30 10:02:01 +01:00
c.lamboo
2f452c6581 enable_sentry in install commands 2023-11-30 10:01:20 +01:00