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

29423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
j.spijker@ultimaker.com
dee54c4eb1
Use forked pyinstaller with fix 
pyinstaller doesn't play nice with MacOS Apps and codesigning.
https://developer.apple.com/library/archive/technotes/tn2206/_index.html#//apple_ref/doc/uid/DTS40007919-CH1-TNTAG206

The following personal fork should provide a quick fix for this even
though pyinstaller still doesn't fully adhere to the file structure
specified by Apple.

See branch: https://github.com/jellespijker/pyinstaller@binaries_in_frameworks
Once this has been tested and verified to work I will open up
a PR against the pyinstaller repo.

Contributes to CURA-9365
 2022-07-01 23:26:56 +02:00
j.spijker@ultimaker.com
253e61cd4e Don't use collect all on PyQt6 
Contributes to CURA-9365
 2022-07-01 17:10:15 +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
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
j.spijker@ultimaker.com
79e5950b50 Use simple import of keychain 
Contributes to CURA-9365
 2022-07-01 14:53:49 +02:00
Remco Burema
7ae1b2a074
Merge pull request #12635 from Ultimaker/CURA-9270_discard_or_keep_changes_not_updating 
Add the "clear" hack to the tableModel for discardOrkeepchanges
 2022-07-01 14:44:23 +02:00
j.spijker@ultimaker.com
e843849f0e Rename unlock Macos keychain 
Contributes to CURA-9365
 2022-07-01 14:41:40 +02:00
j.spijker@ultimaker.com
bbcba0c7a0 Import and unlock Macos keychain 
Contributes to CURA-9365
 2022-07-01 14:37:19 +02:00
Remco Burema
3dc646874d
Merge pull request #12634 from Ultimaker/CURA-9402_fix_background_dark_theme 
Fix background dark theme
 2022-07-01 14:30:10 +02:00
Remco Burema
ca36b4f2ef Set proper background color for open project dialogs. 
part of CURA-9402
 2022-07-01 14:22:27 +02:00
j.spijker@ultimaker.com
5e8b137926 Moved AppImage result parallel to Ultimaker-Cura 
Contributes to CURA-9365
 2022-07-01 14:15:07 +02:00
j.spijker@ultimaker.com
da14603aee Use the gpg private key 
Obtained with:
```
 gpg --armor --export-secret-key -u <key_identity_obtained_when_you_import> | base64 | xclip
```

Contributes to CURA-9365
 2022-07-01 13:57:56 +02:00
j.spijker@ultimaker.com
0f5e0a8399 Speed tweaks 
Using the latest python-version should increase the pip install time.
No need to upload the packages here. This is already done when the
packages are created in the previous steps.

Contributes to CURA-9365
 2022-07-01 13:43:20 +02:00
j.spijker@ultimaker.com
42b5aa491d Install GPG key Linux 
Obtained by performing the following commands

```
gpg --import private-gpg.key
gpg --armor --export-secret-key -u <key_id_shown_when_run_previous_cmd>
```

Contributes to CURA-9365
 2022-07-01 13:40:34 +02:00
j.spijker@ultimaker.com
4b547628fc Added build and sign step for the dmg 
Contributes to CURA-9365
 2022-07-01 13:07:11 +02:00
j.spijker@ultimaker.com
8a3d94d2b9 Install and use the appimagetool 
Can be set as an env variable in the script

Contributes to CURA-9365
 2022-07-01 13:01:16 +02:00
j.spijker@ultimaker.com
66a38be94b Use script this time 
Contributes to CURA-9365
 2022-07-01 12:44:17 +02:00
j.spijker@ultimaker.com
0aa65cc268 Set Mac secrets to environment 
Contributes to CURA-9365
 2022-07-01 12:41:51 +02:00
j.spijker@ultimaker.com
b35a8bf3ae Create a Linux AppImage 
Contributes to CURA-9365
 2022-07-01 12:36:53 +02:00
c.lamboo
7c1d2806fa Merge remote-tracking branch 'origin/5.1' into 5.1 2022-07-01 12:35:50 +02:00
c.lamboo
65460a7e3f Add script to fix code signing for qt packages on mac 
CURA-9365
 2022-07-01 12:35:47 +02:00
Ghostkeeper
8b8220c45d
Fix path to icon file 
The script got moved. It looks in the directory relative to __file__ for the icon and other files. Those other files also got moved, but the icons were placed in a centrally stored location. So the path needs to be updated to the new relative path.

Contributes to issue CURA-9409.
 2022-07-01 12:03:24 +02:00
j.delarago
6693354bf7 Merge remote-tracking branch 'origin/5.1' into 5.1 2022-07-01 11:46:51 +02:00
j.delarago
578e9969ca Change source so packaging script can be run from root 
CURA-9365
 2022-07-01 11:46:44 +02:00
j.spijker@ultimaker.com
a9f4d7093d Point to correct paths 
Contributes to CURA-9365
 2022-07-01 11:42:48 +02:00
Ghostkeeper
f4cad7fdfb
Update change log for 5.1 beta 
There will be more in here, but these are the ones we have for the beta.
 2022-07-01 11:40:07 +02:00
j.spijker@ultimaker.com
cbedbbb0bd Remove brackets around env var name 
Contributes to CURA-9365
 2022-07-01 11:33:18 +02:00
j.spijker@ultimaker.com
2fd1309bee Add missing file name 
Contributes to CURA-9365
 2022-07-01 10:50:08 +02:00
j.spijker@ultimaker.com
f2fa309df7 Copy the Cura Installer workflow 
And use the nsis step

Contributes to CURA-9365
 2022-07-01 10:32:12 +02:00
j.spijker@ultimaker.com
085868d692 Copy the packaging scripts/resources and set GH env 
Contributes to CURA-9365
 2022-07-01 10:32:12 +02:00
j.delarago
4ed16881ac Update environment variables 
CURA-8849
 2022-07-01 10:04:38 +02:00
c.lamboo
cf9033498b Fix icon nad bundle identifier in spec file 
icon and bundle_identifier already contain quotes

CURA-9365
 2022-07-01 10:00:38 +02:00
c.lamboo
0580814352 Fix passing macos flag to jinja 
CURA-9365
 2022-07-01 09:56:40 +02:00
Jelle Spijker
61d276f5ee Use ultimaker/testing on main/master branches 
Contributes to CURA-9365
 2022-07-01 09:38:08 +02:00
j.spijker@ultimaker.com
ffd66445d8 Collect all of numpy-stl 
Contributes to CURA-9365
 2022-07-01 09:25:22 +02:00
j.spijker@ultimaker.com
ac2fbbf791 Collect all PyQt6-Qt6 dll's for Win and place them in the root 
Quick fix, we should probably work with hooks in the future

Contributes to CURA-9365
 2022-07-01 09:24:57 +02:00
j.spijker@ultimaker.com
b5e0ae8ff9 fixes for Macos 
Contributes to CURA-9365
 2022-07-01 09:07:38 +02:00
Ghostkeeper
9839393912
Update SDK version to 8.1.0 
There are new functionalities and QML elements for developers to play with.
 2022-07-01 09:04:49 +02:00
Jelle Spijker
ff321409c5 Revert "Clean the install folder first" 
This reverts commit 627bd929c4cce3bac7c4c4a7cdb93e0198752563.
 2022-07-01 08:56:06 +02:00
j.spijker@ultimaker.com
b6676e7bb9 Run workflow when files in packaging changes 
Contributes to CURA-9365
 2022-07-01 08:23:08 +02:00
j.spijker@ultimaker.com
5b771e39d7 Install start menu shortcuts globally 
Use "SetShellVarContext all" so that NSIS installs windows start menu shortcuts globally.
Docs: https://nsis.sourceforge.io/Docs/Chapter4.html#setshellvarcontext

Fixes #12449
Closes Ultimaker/cura-build-environment#147

Contributes to CURA-9365

Co-authored-by: KeenRivals <6865789+KeenRivals@users.noreply.github.com>
 2022-07-01 08:19:27 +02:00