Skip to content

Commit 232c8d1

Browse files
authored
👷 Update CI workflows to use new libhal/ci reusable workflows (#32)
- Rename ci job to library_check for clarity - Replace deploy_all.yml with package_and_upload_all.yml - Migrate demo_builder.yml to app_builder2.yml with simplified profile syntax - Remove scheduled weekly cron trigger - Update micromod platform profiles (mod-stm32f1-v4 → v5, mod-lpc40-v5 → mod-lpc4078-v5) - Add set_version() method to conanfile.py for default "latest" version - Simplify demo dependency to libhal-expander/latest
1 parent 4647c06 commit 232c8d1

4 files changed

Lines changed: 38 additions & 34 deletions

File tree

.github/workflows/ci.yml

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,59 +20,57 @@ on:
2020
push:
2121
branches:
2222
- main
23-
schedule:
24-
- cron: "0 12 * * 0"
2523

2624
jobs:
27-
ci:
25+
library_check:
2826
uses: libhal/ci/.github/workflows/library_check.yml@5.x.y
2927
secrets: inherit
3028

31-
deploy_all_check:
32-
uses: libhal/ci/.github/workflows/deploy_all.yml@5.x.y
29+
deployment_check:
30+
uses: libhal/ci/.github/workflows/package_and_upload_all.yml@5.x.y
3331
secrets: inherit
3432

3533
demo_check_lpc4074:
36-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
34+
uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
3735
with:
38-
compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
39-
compiler_profile: v1/arm-gcc-12.3
40-
platform_profile_url: https://github.com/libhal/libhal-arm-mcu.git
41-
platform_profile: v1/lpc4074
36+
repo: libhal/libhal-actuator
37+
dir: demos
38+
compiler_profile: hal/tc/arm-gcc
39+
platform_profile: hal/mcu/lpc4074
4240
secrets: inherit
4341

4442
demo_check_lpc4078:
45-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
43+
uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
4644
with:
47-
compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
48-
compiler_profile: v1/arm-gcc-12.3
49-
platform_profile_url: https://github.com/libhal/libhal-arm-mcu.git
50-
platform_profile: v1/lpc4078
45+
repo: libhal/libhal-actuator
46+
dir: demos
47+
compiler_profile: hal/tc/arm-gcc
48+
platform_profile: hal/mcu/lpc4078
5149
secrets: inherit
5250

5351
demo_check_stm32f103c8:
54-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
52+
uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
5553
with:
56-
compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
57-
compiler_profile: v1/arm-gcc-12.3
58-
platform_profile_url: https://github.com/libhal/libhal-arm-mcu.git
59-
platform_profile: v1/stm32f103c8
54+
repo: libhal/libhal-actuator
55+
dir: demos
56+
compiler_profile: hal/tc/arm-gcc
57+
platform_profile: hal/mcu/stm32f103c8
6058
secrets: inherit
6159

62-
demo_check_mod-stm32f1-v4:
63-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
60+
demo_check_mod-stm32f1-v5:
61+
uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
6462
with:
65-
compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
66-
compiler_profile: v1/arm-gcc-12.3
67-
platform_profile_url: https://github.com/libhal/libhal-micromod.git
68-
platform_profile: v1/mod-stm32f1-v4
63+
repo: libhal/libhal-actuator
64+
dir: demos
65+
compiler_profile: hal/tc/arm-gcc
66+
platform_profile: hal/bsp/mod-stm32f1-v5
6967
secrets: inherit
7068

71-
demo_check_mod-lpc40-v5:
72-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
69+
demo_check_mod-lpc4078-v5:
70+
uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
7371
with:
74-
compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
75-
compiler_profile: v1/arm-gcc-12.3
76-
platform_profile_url: https://github.com/libhal/libhal-micromod.git
77-
platform_profile: v1/mod-lpc40-v5
72+
repo: libhal/libhal-actuator
73+
dir: demos
74+
compiler_profile: hal/tc/arm-gcc
75+
platform_profile: hal/bsp/mod-lpc4078-v5
7876
secrets: inherit

.github/workflows/deploy.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ on:
88
jobs:
99
deploy:
1010
if: startsWith(github.ref, 'refs/tags/')
11-
uses: libhal/ci/.github/workflows/deploy_all.yml@5.x.y
11+
uses: libhal/ci/.github/workflows/package_and_upload_all.yml@5.x.y
1212
with:
13+
dir: .
1314
version: ${{ github.ref_name }}
15+
remote_url: https://libhal.jfrog.io/artifactory/api/conan/trunk-conan
1416
secrets: inherit

conanfile.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ class libhal_expander_conan(ConanFile):
2929
python_requires = "libhal-bootstrap/[>=4.4.0 <5]"
3030
python_requires_extend = "libhal-bootstrap.library"
3131

32+
def set_version(self):
33+
if not self.version:
34+
self.version = "latest"
35+
3236
def requirements(self):
3337
self.requires("libhal/[^4.12.1]", transitive_headers=True)
3438
self.requires("libhal-util/[^5.5.0]", transitive_headers=True)

demos/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ class demos(ConanFile):
2121
def requirements(self):
2222
bootstrap = self.python_requires["libhal-bootstrap"]
2323
bootstrap.module.add_demo_requirements(self)
24-
self.requires("libhal-expander/[1.3.0 || latest]")
24+
self.requires("libhal-expander/latest")

0 commit comments

Comments
 (0)