Skip to content

Commit

Permalink
[github-actions] deprecate the configuration OT_POSIX_CONFIG_RCP_BUS
Browse files Browse the repository at this point in the history
OpenThread has deprecated the configuration `OT_POSIX_CONFIG_RCP_BUS`. It causes
build issues in openthread#2060. This commit
updates the github action test scripts to avoid using the configuration
`OT_POSIX_CONFIG_RCP_BUS`.
  • Loading branch information
zhanglongxia committed Oct 12, 2023
1 parent 1fd52b0 commit 5ded1a0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
rcp_bus: ["UART", "SPI"]
env:
OT_POSIX_CONFIG_RCP_BUS: ${{matrix.rcp_bus}}
OTBR_COVERAGE: 1
VERBOSE: 1
steps:
Expand Down
10 changes: 2 additions & 8 deletions tests/scripts/check-docker
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@

set -euxo pipefail

OT_POSIX_CONFIG_RCP_BUS=${OT_POSIX_CONFIG_RCP_BUS:-UART}
readonly OT_POSIX_CONFIG_RCP_BUS

on_exit()
{
local status=$?
Expand All @@ -56,15 +53,12 @@ main()
{
sudo modprobe ip6table_filter
docker build -t otbr \
--build-arg OTBR_OPTIONS=-DOT_POSIX_CONFIG_RCP_BUS="${OT_POSIX_CONFIG_RCP_BUS}" \
--build-arg OTBR_OPTIONS=-DOPENTHREAD_POSIX_CONFIG_SPINEL_SPI_INTERFACE_ENABLE=1 \
--build-arg BACKBONE_ROUTER=0 \
-f etc/docker/Dockerfile .

# SPI simulation is not available yet, so just verify the binary runs
if [[ ${OT_POSIX_CONFIG_RCP_BUS} == SPI ]]; then
docker run --rm -t --entrypoint otbr-agent otbr -h | grep 'spi://'
return 0
fi
docker run --rm -t --entrypoint otbr-agent otbr -h | grep 'spi://'

local -r SOCAT_OUTPUT=/tmp/ot-socat
socat -d -d pty,raw,echo=0 pty,raw,echo=0 2>&1 | tee $SOCAT_OUTPUT &
Expand Down

0 comments on commit 5ded1a0

Please sign in to comment.