Skip to content

✨ Add extra_conan_arguments support to package workflows #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kammce merged 2 commits into from
Jan 18, 2026
Merged

✨ Add extra_conan_arguments support to package workflows #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0026c23
:sparkles: Add extra_conan_arguments support to package workflows
kammce Jan 18, 2026
c709444
[skip ci] restore old tests
kammce Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/package_and_upload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ on:
remote_url: # Path to conan package repo
type: string
default: ""
extra_conan_arguments:
type: string
default: ""
description: "Extra arguments to pass to conan create commands"

secrets:
conan_remote_user:
Expand Down Expand Up @@ -99,13 +103,13 @@ jobs:
run: conan config install https://github.com/libhal/conan-config2.git --args="-b ${{ inputs.config2_version }}"

- name: 📦 Create `Debug` package for ${{ inputs.profile }}
run: conan create ${{ inputs.dir }} -s:h build_type=Debug -s:h os=${{ inputs.os }} -s:h arch=${{ inputs.arch }} --version=${{ inputs.version }} -pr:h ${{ inputs.compiler_profile }} --build=missing
run: conan create ${{ inputs.dir }} -s:h build_type=Debug -s:h os=${{ inputs.os }} -s:h arch=${{ inputs.arch }} --version=${{ inputs.version }} -pr:h ${{ inputs.compiler_profile }} --build=missing ${{ inputs.extra_conan_arguments }}

- name: 📦 Create `MinSizeRel` package for ${{ inputs.profile }}
run: conan create ${{ inputs.dir }} -s:h build_type=MinSizeRel -s:h os=${{ inputs.os }} -s:h arch=${{ inputs.arch }} --version=${{ inputs.version }} -pr:h ${{ inputs.compiler_profile }} --build=missing
run: conan create ${{ inputs.dir }} -s:h build_type=MinSizeRel -s:h os=${{ inputs.os }} -s:h arch=${{ inputs.arch }} --version=${{ inputs.version }} -pr:h ${{ inputs.compiler_profile }} --build=missing ${{ inputs.extra_conan_arguments }}

- name: 📦 Create `Release` package for ${{ inputs.profile }}
run: conan create ${{ inputs.dir }} -s:h build_type=Release -s:h os=${{ inputs.os }} -s:h arch=${{ inputs.arch }} --version=${{ inputs.version }} -pr:h ${{ inputs.compiler_profile }} --build=missing
run: conan create ${{ inputs.dir }} -s:h build_type=Release -s:h os=${{ inputs.os }} -s:h arch=${{ inputs.arch }} --version=${{ inputs.version }} -pr:h ${{ inputs.compiler_profile }} --build=missing ${{ inputs.extra_conan_arguments }}

- name: 📡 Sign into Conan Package Repository
if: ${{ inputs.version != 'latest' && inputs.remote_url != '' && env.CONAN_REMOTE_USER != '' && env.CONAN_REMOTE_PASSWORD != '' }}
Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/package_and_upload_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ on:
type: string
default: "5.x.y"
description: "Git ref (branch, tag, or SHA) of libhal/ci to use for scripts"
extra_conan_arguments:
type: string
default: ""
description: "Extra arguments to pass to conan create commands"

secrets:
conan_remote_password:
Expand All @@ -70,6 +74,7 @@ jobs:
version: ${{ inputs.version }}
dir: ${{ inputs.dir }}
remote_url: ${{ inputs.remote_url }}
extra_conan_arguments: ${{ inputs.extra_conan_arguments }}
secrets:
conan_remote_user: ${{ secrets.conan_remote_user }}
conan_remote_password: ${{ secrets.conan_remote_password }}
Expand All @@ -89,6 +94,7 @@ jobs:
version: ${{ inputs.version }}
dir: ${{ inputs.dir }}
remote_url: ${{ inputs.remote_url }}
extra_conan_arguments: ${{ inputs.extra_conan_arguments }}
secrets:
conan_remote_user: ${{ secrets.conan_remote_user }}
conan_remote_password: ${{ secrets.conan_remote_password }}
Expand All @@ -108,6 +114,7 @@ jobs:
version: ${{ inputs.version }}
dir: ${{ inputs.dir }}
remote_url: ${{ inputs.remote_url }}
extra_conan_arguments: ${{ inputs.extra_conan_arguments }}
secrets:
conan_remote_user: ${{ secrets.conan_remote_user }}
conan_remote_password: ${{ secrets.conan_remote_password }}
Expand Down Expand Up @@ -154,7 +161,8 @@ jobs:
--version ${{ inputs.version }} \
--compiler-profile hal/tc/llvm \
--conan-version ${{ inputs.conan_version }} \
--arch-list cortex-m3,cortex-m4,cortex-m4f,cortex-m7f,cortex-m7d,cortex-m23,cortex-m33,cortex-m33f,cortex-m35pf,cortex-m55,cortex-m85
--arch-list cortex-m3,cortex-m4,cortex-m4f,cortex-m7f,cortex-m7d,cortex-m23,cortex-m33,cortex-m33f,cortex-m35pf,cortex-m55,cortex-m85 \
--extra-conan-args "${{ inputs.extra_conan_arguments }}"

- name: 📦 Build packages for all Cortex-M architectures
working-directory: target-repo
Expand All @@ -165,7 +173,8 @@ jobs:
--version ${{ inputs.version }} \
--compiler-profile hal/tc/llvm \
--conan-version ${{ inputs.conan_version }} \
--arch-list cortex-m0,cortex-m0plus,cortex-m1,cortex-m3,cortex-m4,cortex-m4f,cortex-m7f,cortex-m7d,cortex-m23,cortex-m33,cortex-m33f,cortex-m35pf,cortex-m55,cortex-m85
--arch-list cortex-m0,cortex-m0plus,cortex-m1,cortex-m3,cortex-m4,cortex-m4f,cortex-m7f,cortex-m7d,cortex-m23,cortex-m33,cortex-m33f,cortex-m35pf,cortex-m55,cortex-m85 \
--extra-conan-args "${{ inputs.extra_conan_arguments }}"

- name: 📡 Add conan user remote-package-repo
if: ${{ inputs.remote_url != '' }}
Expand Down Expand Up @@ -221,7 +230,8 @@ jobs:
--version ${{ inputs.version }} \
--compiler-profile hal/tc/arm-gcc \
--conan-version ${{ inputs.conan_version }} \
--arch-list cortex-m0,cortex-m0plus,cortex-m1,cortex-m3,cortex-m4,cortex-m4f,cortex-m7f,cortex-m7d,cortex-m23,cortex-m33,cortex-m33f,cortex-m35pf,cortex-m55,cortex-m85
--arch-list cortex-m0,cortex-m0plus,cortex-m1,cortex-m3,cortex-m4,cortex-m4f,cortex-m7f,cortex-m7d,cortex-m23,cortex-m33,cortex-m33f,cortex-m35pf,cortex-m55,cortex-m85 \
--extra-conan-args "${{ inputs.extra_conan_arguments }}"

- name: 📡 Add conan user remote-package-repo
if: ${{ inputs.remote_url != '' }}
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/self_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ on:
- cron: "0 12 * * 0"
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
library_check_libhal_v4:
uses: ./.github/workflows/library_check.yml
Expand Down Expand Up @@ -85,6 +89,7 @@ jobs:
library: strong_ptr
repo: libhal/strong_ptr
modules_support_needed: true
ci_ref: ${{ github.head_ref || github.ref_name }}
secrets: inherit

package-libhal_v4:
Expand All @@ -93,6 +98,7 @@ jobs:
library: libhal
repo: libhal/libhal
dir: v4
ci_ref: ${{ github.head_ref || github.ref_name }}
secrets: inherit

package-libhal-util:
Expand All @@ -101,6 +107,7 @@ jobs:
library: libhal-util
repo: libhal/libhal-util
dir: v5
ci_ref: ${{ github.head_ref || github.ref_name }}
secrets: inherit

# TODO(#95): Enable Windows
Expand Down
15 changes: 10 additions & 5 deletions scripts/baremetal_package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ VERSION="latest"
COMPILER_PROFILE="hal/tc/llvm"
ARCH_LIST=("cortex-m3")
CONAN_VERSION=2.23.0
EXTRA_CONAN_ARGS=""

# Parse command line arguments
while [[ $# -gt 0 ]]; do
Expand All @@ -42,9 +43,13 @@ while [[ $# -gt 0 ]]; do
IFS=',' read -ra ARCH_LIST <<< "$2"
shift 2
;;
--extra-conan-args)
EXTRA_CONAN_ARGS="$2"
shift 2
;;
*)
echo "Unknown option: $1"
echo "Usage: $0 [--dir DIR] [--version VERSION] [--compiler-profile PROFILE] [--conan-version VERSION] [--arch-list ARCH1,ARCH2,...]"
echo "Usage: $0 [--dir DIR] [--version VERSION] [--compiler-profile PROFILE] [--conan-version VERSION] [--arch-list ARCH1,ARCH2,...] [--extra-conan-args ARGS]"
exit 1
;;
esac
Expand All @@ -59,9 +64,9 @@ conan hal setup
for ARCH in "${ARCH_LIST[@]}"; do
echo "Building for architecture: $ARCH"

conan create $DIR -s:h build_type=Debug -s:h os=baremetal -s:h arch=$ARCH --version $VERSION -pr:h $COMPILER_PROFILE --build=missing
conan create $DIR -s:h build_type=Debug -s:h os=baremetal -s:h arch=$ARCH --version $VERSION -pr:h $COMPILER_PROFILE --build=missing $EXTRA_CONAN_ARGS

conan create $DIR -s:h build_type=MinSizeRel -s:h os=baremetal -s:h arch=$ARCH --version $VERSION -pr:h $COMPILER_PROFILE --build=missing
conan create $DIR -s:h build_type=MinSizeRel -s:h os=baremetal -s:h arch=$ARCH --version $VERSION -pr:h $COMPILER_PROFILE --build=missing $EXTRA_CONAN_ARGS

conan create $DIR -s:h build_type=Release -s:h os=baremetal -s:h arch=$ARCH --version $VERSION -pr:h $COMPILER_PROFILE --build=missing
done
conan create $DIR -s:h build_type=Release -s:h os=baremetal -s:h arch=$ARCH --version $VERSION -pr:h $COMPILER_PROFILE --build=missing $EXTRA_CONAN_ARGS
done