Skip to content

Commit

Permalink
[.github/workflows] Added pigweed-app related builds to workflows.
Browse files Browse the repository at this point in the history
There is no build validation in CI for pigweed-app,
as this app related builds are not ran in the github workflows.

* Modified nrfconnect_example.sh to take board name as an mandatory
argument and also allow passing list of additional arguments
(e.g. attaching overlays).
* Added pigweed-app build and lighting-app with rpc.overlay build
to the nrfconnect github workflows.
* Renamed esp_echo_app.sh to the esp_example.sh and modified it
to take application name as an argument.
* Added pigweed-app build to the esp32 github workflow.
* Renamed Echo App build step to the All Clusters App in the esp32
and qemu github workflows, as in fact that app is being build.
  • Loading branch information
kkasperczyk-no committed Jan 29, 2021
1 parent 43e5ae6 commit 6dafcf2
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 22 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,20 @@ jobs:
with:
languages: "cpp, python"
queries: +security-and-quality
- name: Build example Echo App
run: scripts/examples/esp_echo_app.sh
- name: Build example All Clusters App
run: scripts/examples/esp_example.sh all-clusters-app
- name: Copy aside build products
run: |
mkdir -p example_binaries/$BUILD_TYPE-build
cp examples/all-clusters-app/esp32/build/chip-all-clusters-app.elf \
example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf
- name: Build example Pigweed App
run: scripts/examples/esp_example.sh pigweed-app
- name: Copy aside build products
run: |
mkdir -p example_binaries/$BUILD_TYPE-build
cp examples/pigweed-app/esp32/build/chip-pigweed-app.elf \
example_binaries/$BUILD_TYPE-build/chip-pigweed-app.elf
- name: Binary artifact suffix
id: outsuffix
uses: haya14busa/action-cond@v1.0.0
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/examples-nrfconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ jobs:
# with:
# languages: "cpp, python"
# queries: +security-and-quality
- name: Build example nRF Connect SDK Lock App
run: scripts/examples/nrfconnect_example.sh lock-app
- name: Build example nRF Connect SDK Lighting App
run: scripts/examples/nrfconnect_example.sh lighting-app
- name: Build example nRF Connect SDK Shell
run: scripts/examples/nrfconnect_example.sh shell
- name: Build example nRF Connect SDK Lock App on nRF52840 DK
run: scripts/examples/nrfconnect_example.sh lock-app nrf52840dk_nrf52840
- name: Build example nRF Connect SDK Lighting App on nRF52840 DK
run: scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=rpc.overlay
- name: Build example nRF Connect SDK Shell on nRF52840 DK
run: scripts/examples/nrfconnect_example.sh shell nrf52840dk_nrf52840
- name: Build example nRF Connect SDK Pigweed on nRF52840 DK
run: scripts/examples/nrfconnect_example.sh pigweed-app nrf52840dk_nrf52840
- name: Run unit tests for Zephyr native_posix_64 platform
run:
scripts/tests/nrfconnect_native_posix_tests.sh native_posix_64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/qemu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
uses: actions/checkout@v2
with:
submodules: true
- name: Build example Echo App
run: scripts/examples/esp_echo_app.sh
- name: Build example All Clusters App
run: scripts/examples/esp_example.sh all-clusters-app
- name: Build ESP32 QEMU and Run Tests
run: scripts/tests/esp32_qemu_tests.sh /tmp/test_logs
- name: Uploading Logs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
with:
submodules: true
- name: Build
run: scripts/examples/esp_echo_app.sh
run: scripts/examples/esp_example.sh all-clusters-app

- name: Upload artifact
run: |
Expand Down
16 changes: 8 additions & 8 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@
"problemMatcher": ["$gcc"]
},
{
"label": "Build nRF Connect Lock Example",
"label": "Build nRF Connect Lock Example (nRF52840)",
"type": "shell",
"command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh lock-app",
"command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh lock-app nrf52840dk_nrf52840",
"group": "build",
"problemMatcher": {
"base": "$gcc",
Expand All @@ -194,9 +194,9 @@
}
},
{
"label": "Build nRF Connect Lighting Example",
"label": "Build nRF Connect Lighting Example (nRF52840)",
"type": "shell",
"command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh lighting-app",
"command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh lighting-app nrf52840dk_nrf52840 -DOVERLAY_CONFIG=rpc.overlay",
"group": "build",
"problemMatcher": {
"base": "$gcc",
Expand All @@ -207,9 +207,9 @@
}
},
{
"label": "Build nRF Connect Shell Example",
"label": "Build nRF Connect Shell Example (nRF52840)",
"type": "shell",
"command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh shell",
"command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh shell nrf52840dk_nrf52840",
"group": "build",
"problemMatcher": {
"base": "$gcc",
Expand All @@ -220,9 +220,9 @@
}
},
{
"label": "Build nRF Connect Pigweed Example",
"label": "Build nRF Connect Pigweed Example (nRF52840)",
"type": "shell",
"command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh pigweed-app",
"command": "source scripts/activate.sh && scripts/examples/nrfconnect_example.sh pigweed-app nrf52840dk_nrf52840",
"group": "build",
"problemMatcher": {
"base": "$gcc",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@
set -x
env

root=examples/all-clusters-app/esp32/
app="$1"
root=examples/$app/esp32/

shift 1

if [ -z "$app" ]; then
echo "No mandatory app argument supplied!"
exit 1
fi

# shellcheck source=/dev/null
source "$root"/idf.sh
Expand Down
12 changes: 10 additions & 2 deletions scripts/examples/nrfconnect_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,15 @@
# limitations under the License.
#

# Run bootstrap to set up e.g. Pigweed correctly
# Run bootstrap and activate to set up e.g. Pigweed correctly
source "$(dirname "$0")/../../scripts/bootstrap.sh"
source "$(dirname "$0")/../../scripts/activate.sh"

cd "$(dirname "$0")/../../examples"

APP="$1"
BOARD="$2"
shift 2

if [[ ! -f "$APP/nrfconnect/CMakeLists.txt" ]]; then
echo "Usage: $0 <application>" >&2
Expand All @@ -30,8 +33,13 @@ if [[ ! -f "$APP/nrfconnect/CMakeLists.txt" ]]; then
exit 1
fi

if [ -z "$BOARD" ]; then
echo "No mandatory BOARD argument supplied!"
exit 1
fi

set -x
[[ -n $ZEPHYR_BASE ]] && source "$ZEPHYR_BASE/zephyr-env.sh"
env

west build -b nrf52840dk_nrf52840 -d "$APP/nrfconnect/build" "$APP/nrfconnect"
west build -b $BOARD -d "$APP/nrfconnect/build" "$APP/nrfconnect" -- "$@"

0 comments on commit 6dafcf2

Please sign in to comment.