Commit graph

763 commits

Author SHA1 Message Date
Joey de l'Arago
65bf56e9fa Installer was replacing any previous cura version when installing. Casuing strange install locations. Now it will only replace cura version with the exact same CURA_CONAN_VERSION
CURA-6867
2023-01-13 10:18:33 +01:00
Joey de l'Arago
0f683d301a Remove double .dmg at the end of file name.
Fix typo in msi_instaler

CURA-6867
2023-01-13 09:26:54 +01:00
Joey de l'Arago
116d2b9ce5 Add source path back to macOs installer for fetching dmg background image
CURA-6867
2023-01-12 16:19:24 +01:00
Joey de l'Arago
3a24ab1bee Merge branch 'main' into CURA-6867_pkg_for_macos 2023-01-12 15:25:32 +01:00
Joey de l'Arago
e25730ad77 We hit the max 10 inputs for the workflow. Remove the pkg input and use the msi one temporarily instead.
CURA-6867
2023-01-12 14:15:53 +01:00
Jelle Spijker
37725db5e3 Added comment about requirements 2023-01-12 13:26:02 +01:00
Joey de l'Arago
05e1f57324 Revert dmg deprecation
CURA-6867
2023-01-12 13:24:28 +01:00
Jelle Spijker
ee29fa5b28 Specify requirements cache path 2023-01-12 13:04:48 +01:00
Jelle Spijker
28478710fc
Don't use requirements.txt 2023-01-12 10:58:05 +01:00
Jelle Spijker
3db6cb5dab
don't use requirements.txt 2023-01-12 10:57:16 +01:00
Jelle Spijker
7eadd0b56b
Use Cura requirements-conan-package everywhere 2023-01-12 10:53:00 +01:00
Jelle Spijker
789a24afb4
Don't use Conan 1.57.0 2023-01-12 10:49:36 +01:00
Jelle Spijker
e2252d818e
Reuse the requirements.txt from Cura across repo 2023-01-12 10:48:58 +01:00
Joey de l'Arago
9ae3bc37dc Rename MacOs -> MacOS
CURA-6867
2023-01-11 13:27:26 +01:00
Joey de l'Arago
ddb4547598 Use path to join paths
CURA-6867
2023-01-11 11:57:51 +01:00
Joey de l'Arago
b96c0dce39 Remove source path from build_macos.py because it is unused.
Refactor filename because it now includes the extension.

The component now has -Component.pkg instead of the installer usincg -Installer.pkg. They must have different names but now the input filename is used to upload the artifacts.

CURA-6867
2023-01-10 10:11:27 +01:00
Joey de l'Arago
43b672834b Deprecate DMG building.
CURA-6867
2023-01-10 09:29:49 +01:00
Joey de l'Arago
db501f5eed Merge branch 'main' into CURA-6867_pkg_for_macos
# Conflicts:
#	.github/workflows/cura-installer.yml
2023-01-10 09:19:01 +01:00
Jelle Spijker
16d2dbf750 Check against macOS
Contribute to CURA-9157 and CURA-6867
2023-01-09 14:51:17 +01:00
Jelle Spijker
3e4453f48b Package the specific file
Contribute to CURA-9157 and CURA-6867
2023-01-09 14:19:58 +01:00
Jelle Spijker
79b898b9f6 Use step output instead of environment vars
Contribute to CURA-9157 and CURA-6867
2023-01-09 14:05:05 +01:00
Jelle Spijker
6b1722b693 Create separate archives per extension
Contribute to CURA-9157 and CURA-6867
2023-01-09 13:26:37 +01:00
Joey de l'Arago
da061910ed Try using new codesign identity. This is a more generic code sign identity that should work with multiple certificates.
CURA-6867
2023-01-09 11:05:49 +01:00
Jelle Spijker
2f5053da6e
check on version 2023-01-07 14:19:39 +01:00
Jelle Spijker
1caad1c8dc Shorten run name 2023-01-06 15:34:23 +01:00
Jelle Spijker
ee87e0a925 negate bool input in appropriate place 2023-01-06 15:30:27 +01:00
Jelle Spijker
9f3381a54b Treat bool inputs as bools 2023-01-06 15:16:06 +01:00
Jelle Spijker
aafde6fb4c Don't use github.event. 2023-01-06 14:57:20 +01:00
Jelle Spijker
1048b015b3 IDK 2023-01-06 14:53:51 +01:00
Jelle Spijker
fc6472862d IDK 2023-01-06 14:50:36 +01:00
Jelle Spijker
53a9f43e5c IDK 2023-01-06 14:48:05 +01:00
Jelle Spijker
44126324d5 IDK 2023-01-06 14:23:57 +01:00
Jelle Spijker
2aba5ca840 IDK 2023-01-06 14:22:15 +01:00
Jelle Spijker
beac5b7eb1 fix wrong quote placement 2023-01-06 14:01:35 +01:00
Jelle Spijker
6a79fc6d37 remove quotes 2023-01-06 14:00:25 +01:00
Jelle Spijker
f4bfe915e1 msi input as a string 2023-01-06 13:58:56 +01:00
Jelle Spijker
02d9de1aff Require the msi input 2023-01-06 13:34:03 +01:00
Jelle Spijker
4e08e0528e Require the msi input 2023-01-06 13:32:29 +01:00
Jelle Spijker
20c43a4f13 compare against string type 2023-01-06 13:12:02 +01:00
Jelle Spijker
0c8425b273 Ignore old Cura version tags 2023-01-06 13:06:52 +01:00
Jelle Spijker
71ad73beb4 Use bool 2023-01-06 12:57:41 +01:00
Jelle Spijker
9f8509050d Remove conan clean step
Was unused
2023-01-06 12:54:03 +01:00
Jelle Spijker
f737f4a9d2 Use the conan_config input 2023-01-06 12:52:34 +01:00
Jelle Spijker
a704807a02 Use the inputs platform to test os 2023-01-06 12:50:51 +01:00
Jelle Spijker
04cc977967 Use a string instead of bool for the input
Contributes to CURA-8607 and CURA-9157
2023-01-06 12:47:06 +01:00
Jelle Spijker
e842712142 Sign the msi and create two windows jobs (exe/msi)
Contributes to CURA-8607 and CURA-9157
2023-01-06 11:28:32 +01:00
Jelle Spijker
fe3934f03c Merge remote-tracking branch 'origin/CURA-8607_sign_windows_installer_workflow' into CURA-9157_msi_installer 2023-01-06 11:17:39 +01:00
Jelle Spijker
097067321d Use ampersand before signtool command
Contributes to CURA-8607
2023-01-06 10:17:44 +01:00
Jelle Spijker
18b3eb8f2b Use echo to write to GITHUB_OUTPUT
Contributes to CURA-8607
2023-01-06 09:50:09 +01:00
Jelle Spijker
b88f7b87b7 Use env file instead of deprecated set-output
Contributes to CURA-8607
2023-01-06 09:31:33 +01:00