Skip to content

Commit d417f53

Browse files
committed
👷 build_all_variants now deletes build folder
Without doing this, the rest of the builds simply do nothing.
1 parent 901b840 commit d417f53

7 files changed

Lines changed: 23 additions & 8 deletions

File tree

.github/scripts/build_all_variants.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,15 @@ conan hal setup
7171
for ARCH in "${ARCH_LIST[@]}"; do
7272
echo "Building for architecture: $ARCH"
7373

74-
conan build $DIR -pr:b default -s:h build_type=Debug -s:h os=baremetal -s:h arch=$ARCH -pr:h $COMPILER_PROFILE --build=missing --build-require $EXTRA_CONAN_ARGS
74+
conan build $DIR -s build_type=Debug -s os=baremetal -s arch=$ARCH -pr $COMPILER_PROFILE --build=missing $EXTRA_CONAN_ARGS
7575

76-
conan build $DIR -pr:b default -s:h build_type=MinSizeRel -s:h os=baremetal -s:h arch=$ARCH -pr:h $COMPILER_PROFILE --build=missing --build-require $EXTRA_CONAN_ARGS
76+
rm -r $DIR/build
7777

78-
conan build $DIR -pr:b default -s:h build_type=Release -s:h os=baremetal -s:h arch=$ARCH -pr:h $COMPILER_PROFILE --build=missing --build-require $EXTRA_CONAN_ARGS
78+
conan build $DIR -s build_type=MinSizeRel -s os=baremetal -s arch=$ARCH -pr $COMPILER_PROFILE --build=missing $EXTRA_CONAN_ARGS
79+
80+
rm -r $DIR/build
81+
82+
conan build $DIR -s build_type=Release -s os=baremetal -s arch=$ARCH -pr $COMPILER_PROFILE --build=missing $EXTRA_CONAN_ARGS
83+
84+
rm -r $DIR/build
7985
done

.github/workflows/13.2.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ jobs:
99
uses: ./.github/workflows/verify_and_upload.yml
1010
with:
1111
version: "13.2"
12+
additional_architectures: ",cortex-m85"
1213
secrets: inherit

.github/workflows/13.3.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ jobs:
99
uses: ./.github/workflows/verify_and_upload.yml
1010
with:
1111
version: "13.3"
12+
additional_architectures: ",cortex-m85"
1213
secrets: inherit

.github/workflows/13.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ jobs:
99
uses: ./.github/workflows/verify_and_upload.yml
1010
with:
1111
version: "13"
12+
additional_architectures: ",cortex-m85"
1213
secrets: inherit

.github/workflows/14.2.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ jobs:
99
uses: ./.github/workflows/verify_and_upload.yml
1010
with:
1111
version: "14.2"
12+
additional_architectures: ",cortex-m85"
1213
secrets: inherit

.github/workflows/14.3.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ jobs:
99
uses: ./.github/workflows/verify_and_upload.yml
1010
with:
1111
version: "14.3"
12+
additional_architectures: ",cortex-m85"
1213
secrets: inherit

.github/workflows/verify_and_upload.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ on:
2222
version:
2323
type: string
2424
required: true
25+
additional_architectures:
26+
type: string
27+
required: true
28+
default: "Comma delimited list of additional architectures supported by the compiler after cortex-m55"
2529

2630
jobs:
2731
verify-linux-x86_64:
@@ -81,14 +85,14 @@ jobs:
8185
--dir demo \
8286
--compiler-profile conan/profiles/v1/arm-gcc-${{ inputs.version }} \
8387
--conan-version 2.22.2 \
84-
--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
88+
--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${{ inputs.additional_architectures }}
8589

8690
upload-package:
8791
needs:
88-
- verify-linux-x86_64
89-
- verify-linux-arm
90-
- verify-macos-15-arm
91-
- verify-windows-x86_64
92+
# - verify-linux-x86_64
93+
# - verify-linux-arm
94+
# - verify-macos-15-arm
95+
# - verify-windows-x86_64
9296
- cortex-m_gcc
9397

9498
if: ${{ startsWith(github.ref, 'refs/tags/') }}

0 commit comments

Comments
 (0)