Skip to content

Commit 747ff06

Browse files
authored
👷 Update CI workflows to use new libhal/ci reusable workflows (#27)
1 parent d9c73c2 commit 747ff06

File tree

4 files changed

+42
-36
lines changed

4 files changed

+42
-36
lines changed

.github/workflows/ci.yml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,55 +24,55 @@ on:
2424
- cron: "0 12 * * 0"
2525

2626
jobs:
27-
ci:
27+
library_check:
2828
uses: libhal/ci/.github/workflows/library_check.yml@5.x.y
2929
secrets: inherit
3030

31-
deploy_all_check:
32-
uses: libhal/ci/.github/workflows/deploy_all.yml@5.x.y
31+
deployment_check:
32+
uses: libhal/ci/.github/workflows/package_and_upload_all.yml@5.x.y
3333
secrets: inherit
3434

3535
demo_check_lpc4074:
36-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
36+
uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
3737
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
38+
dir: demos
39+
library_dir: .
40+
compiler_profile: hal/tc/arm-gcc
41+
platform_profile: hal/mcu/lpc4074
4242
secrets: inherit
4343

4444
demo_check_lpc4078:
45-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
45+
uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
4646
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
47+
dir: demos
48+
library_dir: .
49+
compiler_profile: hal/tc/arm-gcc
50+
platform_profile: hal/mcu/lpc4078
5151
secrets: inherit
5252

5353
demo_check_stm32f103c8:
54-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
54+
uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
5555
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
56+
dir: demos
57+
library_dir: .
58+
compiler_profile: hal/tc/arm-gcc
59+
platform_profile: hal/mcu/stm32f103c8
6060
secrets: inherit
6161

62-
demo_check_mod-stm32f1-v4:
63-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
64-
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
69-
secrets: inherit
62+
# demo_check_mod-stm32f1-v4:
63+
# uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
64+
# 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
69+
# secrets: inherit
7070

71-
demo_check_mod-lpc40-v5:
72-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
73-
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
78-
secrets: inherit
71+
# demo_check_mod-lpc40-v5:
72+
# uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
73+
# 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
78+
# 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_input_conan(ConanFile):
2929
python_requires = "libhal-bootstrap/[>=4.3.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
# Adds libhal and libhal-util as transitive headers, meaning library
3438
# consumers get the libhal and libhal-util headers downstream.

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-input/[1.1.2 || latest]")
24+
self.requires("libhal-input/latest")

0 commit comments

Comments
 (0)