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 0793572dc3
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 f5a559179b
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 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
