Skip to content

Commit 10ee866

Browse files
committed
Removing unnecessary setup script
1 parent 3226385 commit 10ee866

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

.ci/scripts/setup-arm-baremetal-tools.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@
88
# Setup arm example environment (including TOSA tools)
99
git config --global user.email "[email protected]"
1010
git config --global user.name "Github Executorch"
11-
bash examples/arm/setup.sh --i-agree-to-the-contained-eula
11+
if [ "$#" -eq 0 ]; then
12+
bash examples/arm/setup.sh --i-agree-to-the-contained-eula
13+
else
14+
bash examples/arm/setup.sh --i-agree-to-the-contained-eula "$#"
15+
fi

.ci/scripts/setup-arm-zephyr-x86-64-tools.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

.github/workflows/trunk.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,12 @@ jobs:
239239
conda activate "${CONDA_ENV}"
240240
241241
cxx_flags="-fno-exceptions -fno-rtti -Wall -Werror -Wno-int-in-bool-context -DET_HAVE_PREAD=0"
242+
setup_script_args=""
242243
if [[ ${{ matrix.os}} == "bare_metal" ]]; then
243-
setup_script=.ci/scripts/setup-arm-baremetal-tools.sh
244244
toolchain_prefix=arm-none-eabi-
245245
threshold="103268" # ~100KiB
246246
elif [[ ${{ matrix.os}} == "zephyr-preset" ]]; then
247-
setup_script=.ci/scripts/setup-arm-zephyr-x86-64-tools.sh
247+
setup_script_args="--target-toolchain zephyr"
248248
toolchain_prefix=arm-zephyr-eabi-
249249
threshold="133120" # should be ~125KB, set threshold to 130KB
250250
else
@@ -254,7 +254,7 @@ jobs:
254254
255255
source .ci/scripts/utils.sh
256256
install_executorch "--use-pt-pinned-commit"
257-
${setup_script}
257+
.ci/scripts/setup-arm-baremetal-tools.sh "$setup_script_args"
258258
source examples/arm/ethos-u-scratch/setup_path.sh
259259
260260
# User toolchain

0 commit comments

Comments
 (0)