Skip to content

Commit 0c96fa8

Browse files
committed
fix: do not set ZEPHYR_SDK_INSTALL_DIR in the workflow
The SDK is now automatically chosen, installed and detected by the scripts. This hardcoded path was causing issues with readelf not being found anymore. Also, this was hiding the fact that the environment was being activated too late in the workflow, requiring the user to manually source the venv/bin/activate script or have the ZEPHYR_SDK_INSTALL_DIR variable in the environment.
1 parent 55fa748 commit 0c96fa8

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/package_core.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ jobs:
1010
name: Build and package core
1111
runs-on: ubuntu-latest
1212
env:
13-
ZEPHYR_SDK_INSTALL_DIR: /opt/zephyr-sdk-0.16.8
1413
CCACHE_IGNOREOPTIONS: -specs=*
1514
outputs:
1615
CORE_TAG: ${{ env.CORE_TAG }}

extra/build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
set -e
44

5+
source venv/bin/activate
6+
7+
ZEPHYR_BASE=$(west topdir)/zephyr
8+
59
if [ x$ZEPHYR_SDK_INSTALL_DIR == x"" ]; then
610
SDK_PATH=$(west sdk list | grep path | tail -n 1 | cut -d ':' -f 2 | tr -d ' ')
711
if [ x$SDK_PATH == x ]; then
@@ -50,10 +54,6 @@ fi
5054
echo
5155
echo "Build target: $target $args"
5256

53-
source venv/bin/activate
54-
55-
ZEPHYR_BASE=$(west topdir)/zephyr
56-
5757
# Get the variant name (NORMALIZED_BOARD_TARGET in Zephyr)
5858
variant=$(extra/get_variant_name.sh $target)
5959

0 commit comments

Comments
 (0)