84 Commits

Author SHA1 Message Date
Erwan MATHIEU
41526bfe70 Prepare for merge
CURA-11622
2024-12-04 15:01:15 +01:00
Erwan MATHIEU
6d0a30d496 Use simplified package creation workflow 2024-11-26 11:51:11 +01:00
Erwan MATHIEU
43a3db9c5d Remove build steps from Conan recipe 2024-11-20 21:36:43 +01:00
Erwan MATHIEU
b955123921 Update variable name 2024-09-25 15:31:37 +02:00
Erwan MATHIEU
d91ff40e34 Do not update translations automatically 2024-09-25 10:42:49 +02:00
Erwan MATHIEU
219782b5ad Fix conan argument syntax 2024-09-25 08:58:42 +02:00
Erwan MATHIEU
b526920e7c Use common package creation workflow 2024-09-25 08:48:54 +02:00
Jelle Spijker
e1603f3efd
Use testing for cura_resources
Contribute to NP-186
2024-05-10 13:30:49 +02:00
Jelle Spijker
0942c35c0a
Add cura_resources as dependency and update resource directories
A new dependency 'cura_resources' has been added to the conandata.yml. The handling of 'cura_resources' has been updated, now including specific sections for definitions, extruders, intent, meshes, quality and variants. GitHub Actions workflows and conan scripts have been adjusted accordingly to include these changes.

Contribute to NP-186
2024-05-06 11:40:39 +02:00
Jelle Spijker
b12f7e0ff6
Update conan-package workflows to use specific branch
Conan-package workflows in both 'conan-package.yml' and 'conan-package-resources.yml' have been updated to use a specific branch ('NP-186_seperate_cura_resources') instead of 'main'. Further adjustments will be needed after the branch merge. Also, 'conan_recipe_root' attribute was added in 'conan-package-resources.yml'.

Contribute to NP-186
2024-05-02 13:52:06 +02:00
Jelle Spijker
39b48d6f69
Add Conanfile for Cura resources and Git workflows
Added a new Conanfile for handling Cura resources which includes definitions, extruders, intent, meshes, quality, and variants. Also, updated the `.github/workflows/conan-package.yml` for specific paths and added a new GitHub workflow `conan-package-resources.yml` for handling the packaging of resources.

Contribute to NP-186
2024-04-30 18:06:29 +02:00
Jelle Spijker
b60b07e2b2
build Conan packages
This will compile the mo files.
But be sure that `enable_i18n` option is still removed from the `package_id`.
Such that the build conan package can also be used

Fixes CURA-11497
2024-01-08 13:13:53 +01:00
Jelle Spijker
68460c5547
Also run on 5.6E branch
Fixes CURA-11523
2024-01-08 12:47:28 +01:00
Jelle Spijker
f2f2f742bd
Apply suggestions from code review
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
2023-12-08 14:36:29 +01:00
Jelle Spijker
e6812a31d8
No need to create a conan-package
Contributes to CURA-10831
2023-12-08 07:42:06 +01:00
Jelle Spijker
e1110dd412
Update workflow to be on par with other repo's
Contribute to CURA-10831
2023-11-27 16:23:13 +01:00
Jelle Spijker
01998d2113
Simplify conan-package.yml workflow
Removed redundant workflow dispatch inputs and comments in .github/workflows/conan-package.yml. These were unnecessary
for the push-based workflow and have been simplified to streamline the process and make it more efficient.

Contributes to CURA-10831
2023-11-16 13:35:13 +01:00
Jelle Spijker
96f6aac79b
Create the Cura binaries
Contributes to CURA-10831
2023-11-16 13:25:21 +01:00
Jelle Spijker
220054cbb5
Use cura-workflows to determine version
Contributes to CURA-10831
2023-11-11 08:59:53 +01:00
Casper Lamboo
ecbf89df1c Add enable_i18n install option to packaging
This should fix translations
2023-11-10 19:00:28 +01:00
jellespijker
baafdbfce3 Use gcc-13 and new conan-config 2023-08-31 05:45:44 +02:00
jellespijker
1fb7191dd7 Use conf skip_test
Contributes to CURA-10951
2023-08-31 05:26:40 +02:00
Jelle Spijker
bf1c5c5349
Update conan-package.yml 2023-03-17 18:15:09 +01:00
Jelle Spijker
8744c9991e
Reimplement workflow cache 2023-03-17 17:20:26 +01:00
Jelle Spijker
ac62608e73
Revert "Upload CCI packages"
This reverts commit 945ca5e55cfc516708cc5287511a928a3ab5f5b4.
2023-03-13 11:50:02 +01:00
Jelle Spijker
945ca5e55c
Upload CCI packages 2023-03-13 08:51:05 +01:00
Jelle Spijker
2cf59073ea
Removed caching between jobs
Contributes to CURA-10376
2023-03-08 13:24:47 +01:00
jspijker
e3f6c74f46 Don't remove the latest 2023-02-28 16:50:49 +01:00
jspijker
1018d8fc5c Remove cura-ce
(cherry picked from commit 51f843b478d932a918d3a14fb673749c1ab88cfe)
2023-02-28 16:36:17 +01:00
jspijker
e40eb61ad8 Only upload the actual package
(cherry picked from commit 5e2511252e996115d6386decac229aa47e4af8c3)
2023-02-28 14:29:58 +01:00
jspijker
d45f65d400 Always remove upload latest 2023-02-28 14:11:17 +01:00
jspijker
9cf3c2dd62 allow latest removal to fail 2023-02-28 13:53:14 +01:00
jspijker
d072942eb8 ensure that the latest is removed
(cherry picked from commit 840aada83d46fae87793d8b630a1add79b87fa5a)
2023-02-28 13:34:09 +01:00
Remco Burema
310e27dc70 Data stuck in cache causes grub issues.
grub issues -- hopefully temporary, until github fixed this -- disk (partition)used from last time is cached, but since this runs in the cloud, that's of course no longer valid on the next run
2023-02-23 12:57:29 +01:00
jspijker
945fbbe474 add efibootmgr 2023-02-23 11:45:43 +01:00
jspijker
5ae711e7c8 change indent 2023-02-22 22:16:05 +01:00
jspijker
4675ef8784 No log storing needed 2023-02-22 21:43:40 +01:00
jelle Spijker
132fbe0e17 Fix building translations 2023-02-22 21:05:05 +01:00
Joey de l'Arago
db51fa4274 Fix translations missing from build...maybe? 2023-02-22 17:11:39 +01:00
Joey de l'Arago
2c23221a9a Fix translations missing from build...maybe? 2023-02-22 17:08:58 +01:00
Remco Burema
b0160b2d86 Revert "Specify to build installer per-OS."
This reverts commit 957c25973b0fe57dde7bb16e960a7205e80407f4.
2022-11-16 19:36:26 +01:00
Remco Burema
957c25973b Specify to build installer per-OS.
Exclusion happens _before_ additional includes unfortunaltely, so the matrix is back to being a plain list if OS's. This also means that, if we don't want to build each OS x OS_id, we have to put that information somewhere else. OS_id didn't really belong in the matrix anyway, since it's a derivative value. It's now replaced with a named environment variable.

The way to exclude and select the 'name' used in the filename for each OS seems a little cumbersome, but I didn't find any better way so far.

(should) implement the 'easy', 'lite' version  of CURA-9880
2022-11-16 16:39:14 +01:00
jspijker
76be83434f Use the correct project_name 2022-11-13 10:55:27 +01:00
jspijker
2e0619d647 Fix buildinfo.json generation 2022-11-13 10:47:03 +01:00
jspijker
9d690da9d5 Fix buildinfo.json generation 2022-11-13 10:29:34 +01:00
jelle spijker
30555dbd5b Use lockfile and build_id 2022-11-03 08:14:07 +01:00
jelle spijker
ce8a7b6109 Create Artifactory build info 2022-11-03 07:50:57 +01:00
Jelle Spijker
48ea4cee9f Merge branch '5.2'
# Conflicts:
#	conanfile.py
2022-10-10 10:23:01 +02:00
jspijker
c00135bfac make sure prerelease tag triggers conan-package 2022-10-04 16:36:13 +02:00
Alex
7e218bef8b build: harden conan-package.yml permissions
Signed-off-by: Alex <aleksandrosansan@gmail.com>
2022-09-23 13:22:49 +02:00