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

979 Commits

Author SHA1 Message Date
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 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
Jaime van Kessel
69b443376c
Merge pull request #12601 from turrisxyz/Pinned-Dependencies-GitHub 
chore: Set permissions for GitHub actions
 2022-07-05 14:02:30 +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
j.spijker@ultimaker.com
2cc6cc73f2
Use macos-keychain GH action 
Contributes to CURA-9365
 2022-07-02 00:35:14 +02:00
Jelle Spijker
b0286cb386 Revert "try to unlock" 
This reverts commit d449f560f9f3c2e16e93c555a2a88978b444338d.
 2022-07-01 17:08:48 +02:00
Jelle Spijker
a56c782738 Revert "Use certificate path" 
This reverts commit 1aa67b7f9d7841db7e4cd57d4276d28a50a02ee6.
 2022-07-01 17:08:47 +02:00
j.spijker@ultimaker.com
1aa67b7f9d Use certificate path 
Contributes to CURA-9365
 2022-07-01 16:59:48 +02:00
j.spijker@ultimaker.com
d449f560f9 try to unlock 
Contributes to CURA-9365
 2022-07-01 16:29:48 +02:00
j.spijker@ultimaker.com
1b9648001d try not to unlock 
Contributes to CURA-9365
 2022-07-01 15:37:03 +02:00
j.spijker@ultimaker.com
d13c037dfc changed password arg 
Contributes to CURA-9365
 2022-07-01 15:33:54 +02:00
j.spijker@ultimaker.com
6792490fae capitalize P arg 
Contributes to CURA-9365
 2022-07-01 15:26:00 +02:00
j.spijker@ultimaker.com
e3517a8c11 fixed $ sign 
Contributes to CURA-9365

(cherry picked from commit 74bfd75f7485a0e6d557d3fd8d9867e62e2272e7)
 2022-07-01 15:24:22 +02:00
j.spijker@ultimaker.com
74bfd75f74 fixed $ sign 
Contributes to CURA-9365
 2022-07-01 15:23:22 +02:00
j.spijker@ultimaker.com
05d52860a0 sync workflow with 5.1 
Contributes to CURA-9365
 2022-07-01 15:21:48 +02:00
j.spijker@ultimaker.com
6a712c50fb Do cmds on single line 
Contributes to CURA-9365
 2022-07-01 15:20:24 +02:00
Jelle Spijker
4316ad0548 Add notarize and sign steps 
Contributes to CURA-9365
 2022-07-01 15:17:42 +02:00
Jelle Spijker
e6855ad2f9 use different pass 
Contributes to CURA-9365
 2022-07-01 14:57:37 +02:00