Commit graph

763 commits

Author SHA1 Message Date
j.spijker@ultimaker.com
2c6979bc5e Switch to macos-11
This will drop support for MacOS 10.15 and lower, which will be deprecated
within the next 3 months or so. But the GH hosted runners have dropped support
for this already.

https://github.blog/changelog/2022-07-20-github-actions-the-macos-10-15-actions-runner-image-is-being-deprecated-and-will-be-removed-by-8-30-22/
2022-07-28 10:41:24 +02:00
j.spijker@ultimaker.com
dc00625188 Remove pr_version
Contributes to CURA-9430
2022-07-20 17:05:56 +02:00
j.spijker@ultimaker.com
6e7ac62808 actually create the package
Contributes to CURA-9430
2022-07-20 16:54:24 +02:00
j.spijker@ultimaker.com
0676dea789 allow creation from source
Contributes to CURA-9430
2022-07-20 16:24:13 +02:00
j.spijker@ultimaker.com
10b7b7f2c4 Allow package creation from the source folder
normally you won't need this because it is first exported

Contributes to CURA-9430
2022-07-20 16:17:27 +02:00
j.spijker@ultimaker.com
763768e26d Split uploading Artifactory cura and cura-ce
Contributes to CURA-9365
2022-07-20 13:08:23 +02:00
j.spijker@ultimaker.com
61996e5af6 bump up minor instead of patch
Contributes to CURA-9365
2022-07-19 16:55:16 +02:00
jspijker
a4461a618f Merge branch '5.1'
# Conflicts:
#	conandata.yml
2022-07-19 16:52:20 +02:00
j.spijker@ultimaker.com
559813c7c6 Bump up minor after release
Contributes to CURA-9365
2022-07-19 16:45:49 +02:00
j.spijker@ultimaker.com
c463f2e9d6 use beta instead of alpha
Contributes to CURA-9365
2022-07-19 08:48:25 +02:00
j.spijker@ultimaker.com
d9cc8ca19b Use new cache location
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
2022-07-19 08:36:17 +02:00
j.spijker@ultimaker.com
0397a95381 Use new cache location
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
2022-07-19 08:36:03 +02:00
j.spijker@ultimaker.com
3b1de601d4 Use new cache location
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365

(cherry picked from commit 03285f80fc)
2022-07-19 08:28:07 +02:00
j.spijker@ultimaker.com
03285f80fc Use new cache location
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
2022-07-19 08:26:49 +02:00
j.spijker@ultimaker.com
9569e33b52 Use new cache location
to gert ride of the old Ultimaker capitalized

Contributes to CURA-9365
2022-07-19 08:03:45 +02:00
jspijker
d73aa62d6f Merge branch '5.1' into CURA-9342_add_missing_openssl_1_1_1l_shared_library
# Conflicts:
#	conandata.yml
2022-07-19 07:54:32 +02:00
j.spijker@ultimaker.com
cf77f9073e Fixed wrong context
Contributes to CURA-9365
2022-07-19 07:50:34 +02:00
j.spijker@ultimaker.com
68fd824ee3 fixed typo
Contributes to CURA-9365
2022-07-19 07:48:42 +02:00
j.spijker@ultimaker.com
1253adf31c Only remove alias on Linux
Contributes to CURA-9365
2022-07-19 07:46:56 +02:00
j.spijker@ultimaker.com
fe8686438d Only upload ultimaker and _ to artifactory
Contributes to CURA-9365
2022-07-19 07:45:17 +02:00
j.spijker@ultimaker.com
be361366b3 treat it as a boolean
Contributes to CURA-9365
2022-07-19 07:39:41 +02:00
j.spijker@ultimaker.com
788606cb51 Only remove the binaries with pure export step
Contributes to CURA-9365
2022-07-19 07:36:57 +02:00
j.spijker@ultimaker.com
0b7fe4790b Allow remove alias to fail
Contributes to CURA-9365
2022-07-19 07:29:24 +02:00
j.spijker@ultimaker.com
34fccedd03 Only remove remote aliases
Contributes to CURA-9365
2022-07-19 07:02:29 +02:00
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