Commit graph

812 commits

Author SHA1 Message Date
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
j.spijker@ultimaker.com
4c6ad9f4d6 Specify Ubuntu 22.04 explicitly
The latest points to 22.04, which is the latest stable GH runner

Contributes to CURA-9205
2022-07-11 11:11:17 +02:00
j.spijker@ultimaker.com
5e40f2eaec Build an AppImage with the latest Ubuntu
Instead of trying to support multiple libstdc++ or ship or own (bad pratcice in general)
an easy solution could be to provide two different AppImage's, were one is build on the
latest Ubuntu runner.

This should fix #11856 for the 5.1.0 release, but I don't consider this a permanent and/or
sustainable solution. We should still create a ticket on the backlog to solves this issue
in a more generic way and future-proof way.

Contributes to CURA-9205
2022-07-11 10:09:18 +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
db67c1f66a Don't run with the conan config for powershell
Contributes to CURA-9365
2022-07-08 18:56:50 +02:00
j.spijker@ultimaker.com
c4d78529e0 Use conan-recipe-version from CURA-9365
Contributes to CURA-9365
2022-07-08 18:39:07 +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
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
1066e6a99f Add libEGL to system deps for Linux
Contributes to CURA-9365
2022-07-08 09:33:17 +02:00
j.spijker@ultimaker.com
1c77eb07a4 Use VirtualPythonEnv
Contributes to CURA-9365
2022-07-07 20:08:30 +02:00
jspijker
593ba0ec36 Revert "Also create package when unit-test workflow is changed"
This reverts commit ab4c62e46f.
2022-07-07 19:52:00 +02:00
j.spijker@ultimaker.com
cbe8a90b35 Use local folder
Contributes to CURA-9365
2022-07-07 19:51:38 +02:00
j.spijker@ultimaker.com
ab4c62e46f Also create package when unit-test workflow is changed
needed due to the install without a dot

Contributes to CURA-9365
2022-07-07 17:20:48 +02:00
j.spijker@ultimaker.com
dea224718b Use the exported package
Since the VirtualPythonEnv seems to be broken

Contributes to CURA-9365
2022-07-07 17:19:38 +02:00
Jelle Spijker
c16e1fcf60
Use venv folder 2022-07-07 17:08:21 +02:00
j.spijker@ultimaker.com
d84133c484 Remove redundant options for conan install
Contributes to CURA-9365
2022-07-07 17:00:36 +02:00
j.spijker@ultimaker.com
7ed81f0110 Also test when unit-test workflow changes
Contributes to CURA-9365
2022-07-07 16:57:08 +02:00
j.spijker@ultimaker.com
df5446b4c6 Add unit-tests
Contributes to CURA-9365
2022-07-07 16:55:41 +02:00
j.spijker@ultimaker.com
7405b55d7d
Fix missing dash
Contributes to CURA-9365
2022-07-06 14:10:17 +02:00
j.spijker@ultimaker.com
d3b32b549a
Add libxkbcommon-x11-dev to system deps for Ubuntu
Might fix the segfault on some Linux distro's

Contributes to CURA-9365
2022-07-06 14:01:10 +02:00
j.spijker@ultimaker.com
db8ec3994e
Add conan_install_info.json to the builds
Should help with debugging, We could maybe even use it
later on to update the about page and/or logs

If you want to create a package you should also
pass the `--json <venv_path>/conan_install_info.json` to
the install command.

Contributes to CURA-9365
2022-07-06 13:54:44 +02:00
jellespijker
4344ef066f Fixed paths for the dmg_sign_notarize script
Contributes to CURA-9365
2022-07-06 10:50:01 +02:00