Skip to content

Commit dbd0dd4

Browse files
committed
Replace host profile env variable with action variable
1 parent e7a16cb commit dbd0dd4

4 files changed

Lines changed: 7 additions & 9 deletions

File tree

.github/workflows/14.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,23 @@ jobs:
5555
display_name: Linux x86_64 → Cortex-M4F
5656
version: ${{ inputs.version }}
5757
os: ubuntu-24.04
58-
host_profile: cortex-m4f
58+
host_profile: -pr:h cortex-m4f
5959

6060
verify-linux-arm-cortex-m4:
6161
uses: ./.github/workflows/verify.yml
6262
with:
6363
display_name: Linux ARM → Cortex-M4
6464
version: ${{ inputs.version }}
6565
os: ubuntu-24.04-arm
66-
host_profile: cortex-m4
66+
host_profile: -pr:h cortex-m4
6767

6868
verify-windows-x86_64-cortex-m33f:
6969
uses: ./.github/workflows/verify.yml
7070
with:
7171
display_name: Windows x86_64 → Cortex-M33F
7272
version: ${{ inputs.version }}
7373
os: windows-latest
74-
host_profile: cortex-m33f
74+
host_profile: -pr:h cortex-m33f
7575

7676
upload-package:
7777
needs:

.github/workflows/verify.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ jobs:
4040
fail-fast: false
4141

4242
runs-on: ${{ inputs.os }}
43-
env:
44-
HOST_PROFILE: ${{ inputs.host_profile && format('-pr {0}', inputs.host_profile) || '' }}
4543
steps:
4644
- uses: actions/checkout@v4
4745
with:
@@ -73,11 +71,11 @@ jobs:
7371

7472
- name: 📦 Create gcc Toolchain Package (cross build)
7573
if: ${{ inputs.host_profile != '' }}
76-
run: conan create all --version=${{ inputs.version }} --build-require --build=cmake --build=missing:cmake/* -pr:h gcc-${{ inputs.version }} $HOST_PROFILE --build=make --build=missing:make/*
74+
run: conan create all --version=${{ inputs.version }} --build-require --build=cmake --build=missing:cmake/* -pr:h gcc-${{ inputs.version }} ${{ inputs.host_profile }} --build=make --build=missing:make/*
7775

7876
- name: ⚙️ Build/Install ninja from scratch using gcc for build platform
7977
run: >
8078
conan install --tool-requires="ninja/1.13.2" --build="ninja/*" -pr:a gcc-${{ inputs.version }} --build=cmake --build=missing:cmake/*
8179
8280
- name: 📦 Build C++ demo using GCC toolchain
83-
run: conan build demos/cpp -pr:a gcc-${{ inputs.version }} $HOST_PROFILE
81+
run: conan build demos/cpp -pr:a gcc-${{ inputs.version }} ${{ inputs.host_profile }}

demos/cpp-modules/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ int
66
main()
77
{
88
std::println("\n========== RUNNING MODULES DEMO ==========");
9-
std::println("LLVM Toolchain Demo!");
9+
std::println("GNU Toolchain Demo!");
1010
std::println("👋 Hello, 🌐 World");
1111
std::println("sum(5, 6) = {}", test::sum(5, 6));
1212
std::println("sum(7.2, 2.5) = {}", test::sum(7.2, 2.5));

demos/cpp/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ int
44
main()
55
{
66
std::puts("\n========== RUNNING DEMO ==========");
7-
std::puts("LLVM Toolchain Demo!");
7+
std::puts("GNU Toolchain Demo!");
88
std::puts("👋 Hello, 🌐 World");
99
std::puts("========== DEMO FINISHED ==========\n");
1010
return 0;

0 commit comments

Comments
 (0)