libhal · kammce · Dec 9, 2025 · Dec 9, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,42 +26,36 @@ on:
 jobs:
   ci:
     uses: libhal/ci/.github/workflows/library_check.yml@5.x.y
+    with:
+      dir: v1
     secrets: inherit
 
   deploy_cortex-m4f_check:
-    uses: libhal/ci/.github/workflows/deploy.yml@5.x.y
+    uses: libhal/ci/.github/workflows/package_and_upload_all.yml@5.x.y
     with:
-      arch: cortex-m4f
-      os: baremetal
-      compiler: gcc
-      compiler_version: 12.3
-      compiler_package: arm-gnu-toolchain
+      dir: v1
     secrets: inherit
 
   demo_check_lpc4078:
     uses: ./.github/workflows/demo_check.yml
     with:
-      compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
-      compiler_profile: v1/arm-gcc-12.3
-      platform_profile_url: https://github.com/libhal/libhal-arm-mcu.git
-      platform_profile: v1/lpc4078
+      compiler_profile: hal/tc/arm-gcc-12.3
+      platform_profile: hal/mcu/lpc4078
+      dir: v1/demos
     secrets: inherit
 
   demo_check_stm32f103c8:
     uses: ./.github/workflows/demo_check.yml
     with:
-      compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
-      compiler_profile: v1/arm-gcc-12.3
-      platform_profile_url: https://github.com/libhal/libhal-arm-mcu.git
-      platform_profile: v1/stm32f103c8
+      compiler_profile: hal/tc/arm-gcc-12.3
+      platform_profile: hal/mcu/stm32f103c8
+      dir: v1/demos
     secrets: inherit
 
   build_benchmarks:
-    uses: libhal/ci/.github/workflows/app_builder.yml@5.x.y
+    uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
     with:
-      compiler_profile_url: https://github.com/libhal/arm-gnu-toolchain.git
-      compiler_profile: v1/arm-gcc-12.3
-      platform_profile_url: https://github.com/libhal/libhal-arm-mcu.git
-      platform_profile: v1/stm32f103c8
-      conan_build_dir: benchmark
+      dir: v1/benchmark/
+      compiler_profile: hal/tc/arm-gcc-12.3
+      platform_profile: hal/mcu/lpc4078
     secrets: inherit
diff --git a/.github/workflows/demo_check.yml b/.github/workflows/demo_check.yml
@@ -9,38 +9,31 @@ on:
       version:
         type: string
         default: ""
-      conan_version:
-        type: string
-        default: ""
-      compiler_profile_url:
-        type: string
-        required: true
       compiler_profile:
         type: string
         required: true
       compiler_profile_branch:
         type: string
         default: "main"
-      platform_profile_url:
-        type: string
-        required: true
       platform_profile:
         type: string
         required: true
       platform_profile_branch:
         type: string
         default: "main"
+      dir:
+        type: string
+        default: "."
 jobs:
   build_release: # b/c building the debug does not guarantee that normal build works
-    uses: libhal/ci/.github/workflows/demo_builder.yml@5.x.y
+    uses: libhal/ci/.github/workflows/app_builder2.yml@5.x.y
     with:
-      compiler_profile_url: ${{ inputs.compiler_profile_url }}
       compiler_profile: ${{ inputs.compiler_profile }}
-      platform_profile_url: ${{ inputs.platform_profile_url }}
       platform_profile: ${{ inputs.platform_profile }}
+      dir: ${{ inputs.dir }}
     secrets: inherit
 
-  build_debug: # STOLEN from libhal/ci
+  build_debug:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4.1.1
@@ -56,35 +49,17 @@ jobs:
           submodules: true
           repository: ${{ inputs.repo }}
 
-      - name: 📥 Install Conan ${{ inputs.conan_version }}
-        if: ${{ inputs.conan_version != '' }}
-        run: pipx install conan==${{ inputs.conan_version }}
-
       - name: 📥 Install Conan Latest
-        if: ${{ inputs.conan_version == '' }}
         run: pipx install conan
 
-      - name: 📡 Add `libhal` repo to conan remotes
-        run: conan remote add libhal
-          https://libhal.jfrog.io/artifactory/api/conan/trunk-conan
-
-      - name: 📡 Create and setup default profile
-        run: conan profile detect --force
-
-      - name: 👁️‍🗨️ Show conan profile
-        run: conan profile show
-
-      - name: Install libhal settings_user.yml
-        run: conan config install -sf profiles/baremetal/v2 https://github.com/libhal/conan-config.git
-
-      - name: Install compiler profiles
-        run: conan config install -tf profiles -sf conan/profiles --args "-b ${{ inputs.compiler_profile_branch }} --single-branch" ${{ inputs.compiler_profile_url }}
+      - name: 📡 Install libhal/conan-config2
+        run: conan config install https://github.com/libhal/conan-config2.git
 
-      - name: Install platform profiles
-        run: conan config install -tf profiles -sf conan/profiles --args "-b ${{ inputs.platform_profile_branch }} --single-branch" ${{ inputs.platform_profile_url }}
+      - name: 📡 Run `conan hal setup`
+        run: conan hal setup
 
-      - name: 🏗️ Build debug demos for ${{ inputs.platform_profile }}
-        run: conan build demos -pr ${{ inputs.compiler_profile }} -pr ${{ inputs.platform_profile }} -s build_type=Debug
+      - name: 🏗️ Build debug ${{ inputs.dir }} for ${{ inputs.platform_profile }}
+        run: conan build ${{ inputs.dir }} -pr ${{ inputs.compiler_profile }} -pr ${{ inputs.platform_profile }} -s build_type=Debug --build=missing
 
       - name: Trim profile version
         id: trim
@@ -96,7 +71,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: build-${{ steps.trim.outputs.trimmed }}
-          path: demos/build/
+          path: ${{ inputs.dir }}/build
 
   check_single_level:
     runs-on: ubuntu-24.04

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   deploy:
     if: startsWith(github.ref, 'refs/tags/')
-    uses: libhal/ci/.github/workflows/deploy_all.yml@5.x.y
+    uses: libhal/ci/.github/workflows/package_and_upload_all.yml@5.x.y
     with:
       version: ${{ github.ref_name }}
     secrets: inherit
diff --git a/.clangd → v1/.clangd b/.clangd → v1/.clangd
diff --git a/CMakeLists.txt → v1/CMakeLists.txt b/CMakeLists.txt → v1/CMakeLists.txt
diff --git a/benchmark/.clangd → v1/benchmark/.clangd b/benchmark/.clangd → v1/benchmark/.clangd
diff --git a/benchmark/CMakeLists.txt → v1/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt → v1/benchmark/CMakeLists.txt
diff --git a/benchmark/README.md → v1/benchmark/README.md b/benchmark/README.md → v1/benchmark/README.md
diff --git a/benchmark/conanfile.py → v1/benchmark/conanfile.py b/benchmark/conanfile.py → v1/benchmark/conanfile.py
@@ -44,8 +44,8 @@ def layout(self):
         cmake_layout(self, build_folder=build_path)
 
     def build_requirements(self):
-        self.tool_requires("make/4.4.1")
-        self.tool_requires("cmake/3.27.1")
+        self.tool_requires("ninja/[^1.0.0]")
+        self.tool_requires("cmake/[^4.0.0]")
         self.tool_requires("libhal-cmake-util/[^4.3.3]")
 
     def generate(self):

diff --git a/benchmark/fast_gcc_unwind.cpp → v1/benchmark/fast_gcc_unwind.cpp b/benchmark/fast_gcc_unwind.cpp → v1/benchmark/fast_gcc_unwind.cpp
diff --git a/benchmark/filler.cpp → v1/benchmark/filler.cpp b/benchmark/filler.cpp → v1/benchmark/filler.cpp
diff --git a/benchmark/gen_depth_tests.py → v1/benchmark/gen_depth_tests.py b/benchmark/gen_depth_tests.py → v1/benchmark/gen_depth_tests.py
diff --git a/...ark/generated_tests/estell_except.cpp.csv → ...ark/generated_tests/estell_except.cpp.csv b/...ark/generated_tests/estell_except.cpp.csv → ...ark/generated_tests/estell_except.cpp.csv
diff --git a/benchmark/generated_tests/except.cpp → v1/benchmark/generated_tests/except.cpp b/benchmark/generated_tests/except.cpp → v1/benchmark/generated_tests/except.cpp
diff --git a/benchmark/generated_tests/except.cpp.csv → v1/benchmark/generated_tests/except.cpp.csv b/benchmark/generated_tests/except.cpp.csv → v1/benchmark/generated_tests/except.cpp.csv
diff --git a/...hmark/generated_tests/gcc_except_fast.csv → ...hmark/generated_tests/gcc_except_fast.csv b/...hmark/generated_tests/gcc_except_fast.csv → ...hmark/generated_tests/gcc_except_fast.csv
diff --git a/benchmark/generated_tests/nearpoint.cpp.csv → ...nchmark/generated_tests/nearpoint.cpp.csv b/benchmark/generated_tests/nearpoint.cpp.csv → ...nchmark/generated_tests/nearpoint.cpp.csv
diff --git a/benchmark/generated_tests/result_error04.cpp → ...chmark/generated_tests/result_error04.cpp b/benchmark/generated_tests/result_error04.cpp → ...chmark/generated_tests/result_error04.cpp
diff --git a/...rk/generated_tests/result_error04.cpp.csv → ...rk/generated_tests/result_error04.cpp.csv b/...rk/generated_tests/result_error04.cpp.csv → ...rk/generated_tests/result_error04.cpp.csv
diff --git a/benchmark/generated_tests/result_error16.cpp → ...chmark/generated_tests/result_error16.cpp b/benchmark/generated_tests/result_error16.cpp → ...chmark/generated_tests/result_error16.cpp
diff --git a/...rk/generated_tests/result_error16.cpp.csv → ...rk/generated_tests/result_error16.cpp.csv b/...rk/generated_tests/result_error16.cpp.csv → ...rk/generated_tests/result_error16.cpp.csv
diff --git a/benchmark/generated_tests/result_error65.cpp → ...chmark/generated_tests/result_error65.cpp b/benchmark/generated_tests/result_error65.cpp → ...chmark/generated_tests/result_error65.cpp
diff --git a/...rk/generated_tests/result_error65.cpp.csv → ...rk/generated_tests/result_error65.cpp.csv b/...rk/generated_tests/result_error65.cpp.csv → ...rk/generated_tests/result_error65.cpp.csv
diff --git a/benchmark/halbord_benchmark.py → v1/benchmark/halbord_benchmark.py b/benchmark/halbord_benchmark.py → v1/benchmark/halbord_benchmark.py
diff --git a/benchmark/main.cpp → v1/benchmark/main.cpp b/benchmark/main.cpp → v1/benchmark/main.cpp
diff --git a/benchmark/nearpoint.cpp → v1/benchmark/nearpoint.cpp b/benchmark/nearpoint.cpp → v1/benchmark/nearpoint.cpp
diff --git a/benchmark/nearpoint_src/nearpoint.cpp → v1/benchmark/nearpoint_src/nearpoint.cpp b/benchmark/nearpoint_src/nearpoint.cpp → v1/benchmark/nearpoint_src/nearpoint.cpp
diff --git a/benchmark/nearpoint_src/order.ld → v1/benchmark/nearpoint_src/order.ld b/benchmark/nearpoint_src/order.ld → v1/benchmark/nearpoint_src/order.ld
diff --git a/benchmark/no_lto/lpc4078 → v1/benchmark/no_lto/lpc4078 b/benchmark/no_lto/lpc4078 → v1/benchmark/no_lto/lpc4078
diff --git a/benchmark/no_lto/stm32f103c8 → v1/benchmark/no_lto/stm32f103c8 b/benchmark/no_lto/stm32f103c8 → v1/benchmark/no_lto/stm32f103c8
diff --git a/benchmark/order.ld → v1/benchmark/order.ld b/benchmark/order.ld → v1/benchmark/order.ld
diff --git a/benchmark/platform.hpp → v1/benchmark/platform.hpp b/benchmark/platform.hpp → v1/benchmark/platform.hpp
diff --git a/benchmark/platforms/lpc4074.cpp → v1/benchmark/platforms/lpc4074.cpp b/benchmark/platforms/lpc4074.cpp → v1/benchmark/platforms/lpc4074.cpp
diff --git a/benchmark/platforms/lpc4078.cpp → v1/benchmark/platforms/lpc4078.cpp b/benchmark/platforms/lpc4078.cpp → v1/benchmark/platforms/lpc4078.cpp
diff --git a/benchmark/platforms/mac.cpp → v1/benchmark/platforms/mac.cpp b/benchmark/platforms/mac.cpp → v1/benchmark/platforms/mac.cpp
diff --git a/benchmark/platforms/stm32f103c8.cpp → v1/benchmark/platforms/stm32f103c8.cpp b/benchmark/platforms/stm32f103c8.cpp → v1/benchmark/platforms/stm32f103c8.cpp
diff --git a/benchmark/platforms/stm32f103zg.cpp → v1/benchmark/platforms/stm32f103zg.cpp b/benchmark/platforms/stm32f103zg.cpp → v1/benchmark/platforms/stm32f103zg.cpp
diff --git a/benchmark/table_graph.csv → v1/benchmark/table_graph.csv b/benchmark/table_graph.csv → v1/benchmark/table_graph.csv
diff --git a/benchmark/test_nearpoint.csv → v1/benchmark/test_nearpoint.csv b/benchmark/test_nearpoint.csv → v1/benchmark/test_nearpoint.csv
diff --git a/benchmark/test_order.csv → v1/benchmark/test_order.csv b/benchmark/test_order.csv → v1/benchmark/test_order.csv
diff --git a/benchmark/test_order_lpc4078.csv → v1/benchmark/test_order_lpc4078.csv b/benchmark/test_order_lpc4078.csv → v1/benchmark/test_order_lpc4078.csv
diff --git a/benchmark/written_tests/result_2_strings.cpp → ...chmark/written_tests/result_2_strings.cpp b/benchmark/written_tests/result_2_strings.cpp → ...chmark/written_tests/result_2_strings.cpp
diff --git a/...rk/written_tests/result_2_strings.cpp.csv → ...rk/written_tests/result_2_strings.cpp.csv b/...rk/written_tests/result_2_strings.cpp.csv → ...rk/written_tests/result_2_strings.cpp.csv
diff --git a/benchmark/written_tests/result_string.cpp → v1/benchmark/written_tests/result_string.cpp b/benchmark/written_tests/result_string.cpp → v1/benchmark/written_tests/result_string.cpp
diff --git a/...hmark/written_tests/result_string.cpp.csv → ...hmark/written_tests/result_string.cpp.csv b/...hmark/written_tests/result_string.cpp.csv → ...hmark/written_tests/result_string.cpp.csv
diff --git a/conanfile.py → v1/conanfile.py b/conanfile.py → v1/conanfile.py
diff --git a/demos/.clangd → v1/demos/.clangd b/demos/.clangd → v1/demos/.clangd
diff --git a/demos/CMakeLists.txt → v1/demos/CMakeLists.txt b/demos/CMakeLists.txt → v1/demos/CMakeLists.txt
diff --git a/demos/applications/multiple_inheritance.cpp → ...mos/applications/multiple_inheritance.cpp b/demos/applications/multiple_inheritance.cpp → ...mos/applications/multiple_inheritance.cpp
diff --git a/demos/applications/single_level.cpp → v1/demos/applications/single_level.cpp b/demos/applications/single_level.cpp → v1/demos/applications/single_level.cpp
diff --git a/demos/conanfile.py → v1/demos/conanfile.py b/demos/conanfile.py → v1/demos/conanfile.py
diff --git a/demos/main.cpp → v1/demos/main.cpp b/demos/main.cpp → v1/demos/main.cpp
diff --git a/demos/platforms/lpc4074.cpp → v1/demos/platforms/lpc4074.cpp b/demos/platforms/lpc4074.cpp → v1/demos/platforms/lpc4074.cpp
diff --git a/demos/platforms/lpc4078.cpp → v1/demos/platforms/lpc4078.cpp b/demos/platforms/lpc4078.cpp → v1/demos/platforms/lpc4078.cpp
diff --git a/demos/platforms/stm32f103c8.cpp → v1/demos/platforms/stm32f103c8.cpp b/demos/platforms/stm32f103c8.cpp → v1/demos/platforms/stm32f103c8.cpp
diff --git a/demos/resource_list.hpp → v1/demos/resource_list.hpp b/demos/resource_list.hpp → v1/demos/resource_list.hpp
diff --git a/include/libhal-exceptions/control.hpp → v1/include/libhal-exceptions/control.hpp b/include/libhal-exceptions/control.hpp → v1/include/libhal-exceptions/control.hpp
diff --git a/...scripts/arm-none-eabi-gcc-14.2_discard.ld → ...scripts/arm-none-eabi-gcc-14.2_discard.ld b/...scripts/arm-none-eabi-gcc-14.2_discard.ld → ...scripts/arm-none-eabi-gcc-14.2_discard.ld
diff --git a/src/arm_cortex/estell/exception.cpp → v1/src/arm_cortex/estell/exception.cpp b/src/arm_cortex/estell/exception.cpp → v1/src/arm_cortex/estell/exception.cpp
diff --git a/src/arm_cortex/estell/internal.hpp → v1/src/arm_cortex/estell/internal.hpp b/src/arm_cortex/estell/internal.hpp → v1/src/arm_cortex/estell/internal.hpp
diff --git a/src/arm_cortex/estell/libunwind_wrappers.cpp → .../arm_cortex/estell/libunwind_wrappers.cpp b/src/arm_cortex/estell/libunwind_wrappers.cpp → .../arm_cortex/estell/libunwind_wrappers.cpp
diff --git a/src/builtin/gcc/impl.cpp → v1/src/builtin/gcc/impl.cpp b/src/builtin/gcc/impl.cpp → v1/src/builtin/gcc/impl.cpp
diff --git a/test_package/CMakeLists.txt → v1/test_package/CMakeLists.txt b/test_package/CMakeLists.txt → v1/test_package/CMakeLists.txt
diff --git a/test_package/conanfile.py → v1/test_package/conanfile.py b/test_package/conanfile.py → v1/test_package/conanfile.py
@@ -14,16 +14,18 @@
 
 
 from conan import ConanFile
+from conan.tools.build import cross_building
 from conan.tools.cmake import CMake, cmake_layout
+from pathlib import Path
 
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
     generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv"
 
     def build_requirements(self):
-        self.tool_requires("make/4.4.1")
-        self.tool_requires("cmake/3.27.1")
+        self.tool_requires("ninja/[^1.13.1]")
+        self.tool_requires("cmake/[^4.0.0]")
 
     def requirements(self):
         self.requires(self.tested_reference_str)
@@ -37,4 +39,6 @@ def build(self):
         cmake.build()
 
     def test(self):
-        pass  # No execution for this binary at this time
+        if not cross_building(self):
+            bin_path = Path(self.cpp.build.bindirs[0]) / "test_package"
+            self.run(bin_path.absolute(), env="conanrun")
diff --git a/test_package/main.cpp → v1/test_package/main.cpp b/test_package/main.cpp → v1/test_package/main.cpp
@@ -93,6 +93,8 @@ int main()
   try {
     foo();
   } catch (error const&) {
-    return -1;
+    return 0;
   }
+
+  return -1;
 }
diff --git a/tests/control.test.cpp → v1/tests/control.test.cpp b/tests/control.test.cpp → v1/tests/control.test.cpp
diff --git a/tests/main.test.cpp → v1/tests/main.test.cpp b/tests/main.test.cpp → v1/tests/main.test.cpp