Skip to content

Commit 60aa8a2

Browse files
kammcekammce
committed
Move files to v1
This makes way for the folder v2 which will contain the next implementation of the library.
1 parent 9612dfa commit 60aa8a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+46
-71
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,43 +25,37 @@ on:
2525

2626
jobs:
2727
ci:
28-
uses: libhal/ci/.github/workflows/library_check.yml@5.x.y
29-
secrets: inherit
28+
# uses: libhal/ci/.github/workflows/library_check.yml@5.x.y
29+
# with:
30+
# dir: v1
31+
# secrets: inherit
3032

31-
deploy_cortex-m4f_check:
32-
uses: libhal/ci/.github/workflows/deploy.yml@5.x.y
33-
with:
34-
arch: cortex-m4f
35-
os: baremetal
36-
compiler: gcc
37-
compiler_version: 12.3
38-
compiler_package: arm-gnu-toolchain
39-
secrets: inherit
33+
# deploy_cortex-m4f_check:
34+
# uses: libhal/ci/.github/workflows/package_and_upload_all.yml@5.x.y
35+
# with:
36+
# dir: v1
37+
# secrets: inherit
4038

4139
demo_check_lpc4078:
4240
uses: ./.github/workflows/demo_check.yml
4341
with:
44-
compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
45-
compiler_profile: v1/arm-gcc-12.3
46-
platform_profile_url: https://github.com/libhal/libhal-arm-mcu.git
47-
platform_profile: v1/lpc4078
42+
compiler_profile: hal/tc/arm-gcc-12.3
43+
platform_profile: hal/mcu/lpc4078
44+
dir: v1/demos
4845
secrets: inherit
4946

5047
demo_check_stm32f103c8:
5148
uses: ./.github/workflows/demo_check.yml
5249
with:
53-
compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
54-
compiler_profile: v1/arm-gcc-12.3
55-
platform_profile_url: https://github.com/libhal/libhal-arm-mcu.git
56-
platform_profile: v1/stm32f103c8
50+
compiler_profile: hal/tc/arm-gcc-12.3
51+
platform_profile: hal/mcu/stm32f103c8
52+
dir: v1/demos
5753
secrets: inherit
5854

5955
build_benchmarks:
60-
uses: libhal/ci/.github/workflows/app_builder.yml@5.x.y
56+
uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
6157
with:
62-
compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
63-
compiler_profile: v1/arm-gcc-12.3
64-
platform_profile_url: https://github.com/libhal/libhal-arm-mcu.git
65-
platform_profile: v1/stm32f103c8
66-
conan_build_dir: benchmark
58+
dir: v1/benchmark/
59+
compiler_profile: hal/tc/arm-gcc-12.3
60+
platform_profile: hal/mcu/lpc4078
6761
secrets: inherit

‎.github/workflows/demo_check.yml‎

Lines changed: 13 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,31 @@ on:
99
version:
1010
type: string
1111
default: ""
12-
conan_version:
13-
type: string
14-
default: ""
15-
compiler_profile_url:
16-
type: string
17-
required: true
1812
compiler_profile:
1913
type: string
2014
required: true
2115
compiler_profile_branch:
2216
type: string
2317
default: "main"
24-
platform_profile_url:
25-
type: string
26-
required: true
2718
platform_profile:
2819
type: string
2920
required: true
3021
platform_profile_branch:
3122
type: string
3223
default: "main"
24+
dir:
25+
type: string
26+
default: "."
3327
jobs:
3428
build_release: # b/c building the debug does not guarantee that normal build works
35-
uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
29+
uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
3630
with:
37-
compiler_profile_url: ${{ inputs.compiler_profile_url }}
3831
compiler_profile: ${{ inputs.compiler_profile }}
39-
platform_profile_url: ${{ inputs.platform_profile_url }}
4032
platform_profile: ${{ inputs.platform_profile }}
33+
dir: ${{ inputs.dir }}
4134
secrets: inherit
4235

43-
build_debug: # STOLEN from libhal/ci
36+
build_debug:
4437
runs-on: ubuntu-22.04
4538
steps:
4639
- uses: actions/checkout@v4.1.1
@@ -56,35 +49,17 @@ jobs:
5649
submodules: true
5750
repository: ${{ inputs.repo }}
5851

59-
- name: 📥 Install Conan ${{ inputs.conan_version }}
60-
if: ${{ inputs.conan_version != '' }}
61-
run: pipx install conan==${{ inputs.conan_version }}
62-
6352
- name: 📥 Install Conan Latest
64-
if: ${{ inputs.conan_version == '' }}
6553
run: pipx install conan
6654

67-
- name: 📡 Add `libhal` repo to conan remotes
68-
run: conan remote add libhal
69-
https://libhal.jfrog.io/artifactory/api/conan/trunk-conan
70-
71-
- name: 📡 Create and setup default profile
72-
run: conan profile detect --force
73-
74-
- name: 👁️‍🗨️ Show conan profile
75-
run: conan profile show
76-
77-
- name: Install libhal settings_user.yml
78-
run: conan config install -sf profiles/baremetal/v2 https://github.com/libhal/conan-config.git
79-
80-
- name: Install compiler profiles
81-
run: conan config install -tf profiles -sf conan/profiles --args "-b ${{ inputs.compiler_profile_branch }} --single-branch" ${{ inputs.compiler_profile_url }}
55+
- name: 📡 Install libhal/conan-config2
56+
run: conan config install https://github.com/libhal/conan-config2.git
8257

83-
- name: Install platform profiles
84-
run: conan config install -tf profiles -sf conan/profiles --args "-b ${{ inputs.platform_profile_branch }} --single-branch" ${{ inputs.platform_profile_url }}
58+
- name: 📡 Run `conan hal setup`
59+
run: conan hal setup
8560

86-
- name: 🏗️ Build debug demos for ${{ inputs.platform_profile }}
87-
run: conan build demos -pr ${{ inputs.compiler_profile }} -pr ${{ inputs.platform_profile }} -s build_type=Debug
61+
- name: 🏗️ Build debug ${{ inputs.dir }} for ${{ inputs.platform_profile }}
62+
run: conan build ${{ inputs.dir }} -pr ${{ inputs.compiler_profile }} -pr ${{ inputs.platform_profile }} -s build_type=Debug --build=missing
8863

8964
- name: Trim profile version
9065
id: trim
@@ -96,7 +71,7 @@ jobs:
9671
uses: actions/upload-artifact@v4
9772
with:
9873
name: build-${{ steps.trim.outputs.trimmed }}
99-
path: demos/build/
74+
path: ${{ inputs.dir }}/build
10075

10176
check_single_level:
10277
runs-on: ubuntu-24.04

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ 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:
1313
version: ${{ github.ref_name }}
1414
secrets: inherit

.clangd renamed to v1/.clangd

File renamed without changes.

CMakeLists.txt renamed to v1/CMakeLists.txt

File renamed without changes.

benchmark/.clangd renamed to v1/benchmark/.clangd

File renamed without changes.

benchmark/CMakeLists.txt renamed to v1/benchmark/CMakeLists.txt

File renamed without changes.

benchmark/README.md renamed to v1/benchmark/README.md

benchmark/conanfile.py renamed to v1/benchmark/conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ def layout(self):
4444
cmake_layout(self, build_folder=build_path)
4545

4646
def build_requirements(self):
47-
self.tool_requires("make/4.4.1")
48-
self.tool_requires("cmake/3.27.1")
47+
self.tool_requires("ninja/[^1.0.0]")
48+
self.tool_requires("cmake/[^4.0.0]")
4949
self.tool_requires("libhal-cmake-util/[^4.3.3]")
5050

5151
def generate(self):

benchmark/fast_gcc_unwind.cpp renamed to v1/benchmark/fast_gcc_unwind.cpp

File renamed without changes.

0 commit comments

Comments
 (0)