GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-10-04 12:46:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,521 Commits 295 Branches 268 Tags
Commit Graph

182 Commits

Author SHA1 Message Date
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
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
j.spijker@ultimaker.com
51da6ca87b remove single quotes 
Contributes to CURA-9365
 2022-07-12 11:49:39 +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
b3c60eb34b Get correct issue number from PR 
Contributes to CURA-9365
 2022-07-12 11:35:08 +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
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
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
ba1e4eb39f use the first index 
Contributes to CURA-9365
 2022-07-12 10:58:25 +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
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
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 ab4c62e46fa685b910c7fdf85302040ad4aa7bc3.
 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
jellespijker
13d5d33ec8 Fixed typo 
Contributes to CURA-9365
 2022-07-06 10:04:53 +02:00
Jelle Spijker
44bb953b27
Fix wrong env variable for bash 2022-07-06 09:30:10 +02:00
j.spijker@ultimaker.com
feebf6d003 uniform name on macos 
Contributes to CURA-9365
 2022-07-06 08:32:05 +02:00
j.spijker@ultimaker.com
bee2b22edf uniform name on linux 
Contributes to CURA-9365
 2022-07-06 07:51:24 +02:00
j.spijker@ultimaker.com
17d2fb8b02 Unlock the keychain as late as possible 
Contributes to CURA-9365
 2022-07-06 07:43:12 +02:00
j.spijker@ultimaker.com
4fb7d0e691 Falling back to original Notarizing script 
Alternative steps were there for debugging purposes

Contributes to CURA-9365
 2022-07-06 07:39:53 +02:00
jellespijker
68a79684fd Remove hacked version 
Contributes to CURA-9365
 2022-07-05 14:07:45 +02:00
jellespijker
baec0e75f7 Merge remote-tracking branch 'origin/5.1' into 5.1 2022-07-05 14:07:11 +02:00
jellespijker
16d9dd5c08 Fix release tag and channel 
Contributes to CURA-9365
 2022-07-05 14:06:19 +02:00
Jelle Spijker
f4c21631ed
removed pound sign from name 2022-07-05 12:56:17 +02:00
Jelle Spijker
f01f97830d
dirty version hack 2022-07-05 12:39:14 +02:00
Jelle Spijker
d7f103c9fe
dirty fix build number 2022-07-05 12:23:53 +02:00
Ghostkeeper
b1af3b6703
Broaden scope of tags that get built 
We want to build the beta tags too. Honestly, I think we could just build any tag automatically, but I'll be good and leave it at this.
I also broadened the tags to build for the stable releases to allow zeroes in the major version number, e.g. if we're going to release version 10.1.0.

Contributes to issue CURA-9365.
 2022-07-05 10:33:37 +02:00
jellespijker
cd288f3d8b Use correct bundle id 
Contributes to CURA-9365
 2022-07-04 14:38:42 +02:00
j.spijker@ultimaker.com
87e304a4e9 Output security response on MacOS 
Contributes to CURA-9365
 2022-07-04 09:26:18 +02:00
j.spijker@ultimaker.com
6df5072443 Added reminder to fix the nightly builds 
Contributes to CURA-9365
 2022-07-04 08:35:22 +02:00
j.spijker@ultimaker.com
fd55ec708d
Add missing create-dmg tool 
Contributes to CURA-9365
 2022-07-02 01:20:43 +02:00
j.spijker@ultimaker.com
1c19230211
Add keychain ext 
Contributes to CURA-9365
 2022-07-02 00:39:52 +02:00