Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit 23456bc

Browse files
suryanshupsuryanshup
committed
Re-enable nRF52840 lock example targets in travis
-- Enable building nRF52840 Lock Example on Linux and OSX -- Rather than installing dependencies for building lock example app in the before install travis script, call the travis prepare script from the lock example repo once it has been cloned. This makes sure that dependency installation for lock example is not duplicated in openweave travis scripts.
1 parent 46649bb commit 23456bc

File tree

7 files changed

+99
-158
lines changed

7 files changed

+99
-158
lines changed

‎.travis.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#
1818
# Description:
19-
# This file is the Travis CI hosted, distributed continuous
19+
# This file is the Travis CI hosted, distributed continuous
2020
# integration configuration file for the OpenWeave Core library.
2121
#
2222

@@ -64,6 +64,12 @@ matrix:
6464
compiler: clang
6565
- name: "ESP32 (openweave-esp32-demo)"
6666
env: BUILD_TARGET="esp32"
67+
- name: "nRF52840 Lock Example (Linux)"
68+
env: BUILD_TARGET="nrf52840-lock-example"
69+
os: linux
70+
- name: "nRF52840 Lock Example (OS X)"
71+
env: BUILD_TARGET="nrf52840-lock-example"
72+
os: osx
6773
- name: "Linux with Defaults against GCC Functional and Unit Tests"
6874
env: BUILD_TARGET="linux-auto-gcc-check" CC="gcc"
6975
os: linux
@@ -104,4 +110,4 @@ deploy:
104110
tags: true
105111
env:
106112
global:
107-
secure: PJdNS8L51Y+Op8xc2C9U13Y6eQUAszDEKigB0jn9LsXB8BZwJsu3mjmtLTQBU99nqAhsCKiN85kxry6APi/xjcDJ3/iRP8IpP8KJ/VV68CChdu1X/2iatSS/EOAT4ZBoo3sUCmP98w4k5G6HiVCpnNprhZOg8xsD9bflVkX9Au67hcwfHfKWyX1c/kbYYyegSWd+7GgkNZRGAws1yuwL1MwGppDqKQJ1bOciALaA1LMzzl1wvrle6t+CWvLH51YoIgndFsTJaphGqXp/hveCIsXEGKY5ZN8RkfuSvs9JupsfoXjA9Nxg2WfLC5c4MeyJV9yvzF9zZNglra9+PTlHFMxnuSvyIKRiHb9rwXMwgtb8Tqwhe0Cikj77gHdRUfZjUNBS34nNRqACSFjSFDM9N862z17BqfMZu0A0znquM24vfm+JV1i7OZ8USdbbmBqtL5qJgimQv2/Y/j3H/o6IrqOLEhuzOXQynclf6xi6AdXlcJ1QmTTicU5JbETJuzkvOYsnUs7TBV0FaPf+j98LEHTXZUPlDtQz4sIu757SiYUuR6Jm357yOwyv+x/PMk250g2op0TtMksjR3HQahnz8HJPYLenOxogYqarqY6E4TNm2P+bRDCPgxQ+dTSvlrcH8qhl+PHImn38q38ghm98WUvqdwxAApI3cZdy4Ja/3WA=
113+
secure: PJdNS8L51Y+Op8xc2C9U13Y6eQUAszDEKigB0jn9LsXB8BZwJsu3mjmtLTQBU99nqAhsCKiN85kxry6APi/xjcDJ3/iRP8IpP8KJ/VV68CChdu1X/2iatSS/EOAT4ZBoo3sUCmP98w4k5G6HiVCpnNprhZOg8xsD9bflVkX9Au67hcwfHfKWyX1c/kbYYyegSWd+7GgkNZRGAws1yuwL1MwGppDqKQJ1bOciALaA1LMzzl1wvrle6t+CWvLH51YoIgndFsTJaphGqXp/hveCIsXEGKY5ZN8RkfuSvs9JupsfoXjA9Nxg2WfLC5c4MeyJV9yvzF9zZNglra9+PTlHFMxnuSvyIKRiHb9rwXMwgtb8Tqwhe0Cikj77gHdRUfZjUNBS34nNRqACSFjSFDM9N862z17BqfMZu0A0znquM24vfm+JV1i7OZ8USdbbmBqtL5qJgimQv2/Y/j3H/o6IrqOLEhuzOXQynclf6xi6AdXlcJ1QmTTicU5JbETJuzkvOYsnUs7TBV0FaPf+j98LEHTXZUPlDtQz4sIu757SiYUuR6Jm357yOwyv+x/PMk250g2op0TtMksjR3HQahnz8HJPYLenOxogYqarqY6E4TNm2P+bRDCPgxQ+dTSvlrcH8qhl+PHImn38q38ghm98WUvqdwxAApI3cZdy4Ja/3WA=

‎.travis/before_install.sh‎

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,10 @@
1818

1919
#
2020
# Description:
21-
# This file is the script for Travis CI hosted, distributed continuous
21+
# This file is the script for Travis CI hosted, distributed continuous
2222
# integration 'before_install' trigger of the 'install' step.
2323
#
2424

25-
NORDIC_SDK_FOR_THREAD_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/SDKs/nRF5-SDK-for-Thread/nRF5-SDK-for-Thread-and-Zigbee/nRF5SDKforThreadandZigbee20029775ac.zip
26-
27-
NORDIC_COMMAND_LINE_TOOLS_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/Desktop-software/nRF5-command-line-tools/sw/nRF-Command-Line-Tools_9_8_1_Linux-x86_64.tar
28-
29-
ARM_GCC_TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
30-
3125
TMPDIR=${TMPDIR-/tmp}
3226

3327
die()
@@ -74,40 +68,14 @@ installdeps()
7468

7569
;;
7670

77-
nrf5-sdk)
78-
# Install Nordic nRF52840 SDK for Thread and Zigbee
79-
wget -O ${TMPDIR}/nordic_sdk_for_thread.zip -nv ${NORDIC_SDK_FOR_THREAD_URL} || exit 1
80-
unzip -d ${TRAVIS_BUILD_DIR}/nRF5x-SDK-for-Thread-and-Zigbee -q ${TMPDIR}/nordic_sdk_for_thread.zip || exit 1
81-
rm ${TMPDIR}/nordic_sdk_for_thread.zip
82-
83-
;;
84-
85-
nrf5-tools)
86-
# Install Nordic nRF5x Command Line Tools
87-
wget -O ${TMPDIR}/nordic_command_line_tools.tar -nv ${NORDIC_COMMAND_LINE_TOOLS_URL} || exit 1
88-
mkdir ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools
89-
tar -C ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools -xf ${TMPDIR}/nordic_command_line_tools.tar || exit 1
90-
rm ${TMPDIR}/nordic_command_line_tools.tar
91-
92-
;;
93-
94-
arm-gcc)
95-
# Install ARM GCC Toolchain
96-
wget -O ${TMPDIR}/arm_gcc_toolchain.tar.bz2 -nv ${ARM_GCC_TOOLCHAIN_URL} || exit 1
97-
mkdir ${TRAVIS_BUILD_DIR}/arm
98-
tar -jxf ${TMPDIR}/arm_gcc_toolchain.tar.bz2 --directory ${TRAVIS_BUILD_DIR}/arm || exit 1
99-
rm ${TMPDIR}/arm_gcc_toolchain.tar.bz2
100-
101-
;;
102-
10371
osx-autotools)
10472
HOMEBREW_NO_AUTO_UPDATE=1 brew install automake libtool
10573
;;
106-
74+
10775
osx-openssl)
10876
HOMEBREW_NO_AUTO_UPDATE=1 brew install openssl
10977
;;
110-
78+
11179
esac
11280
}
11381

@@ -135,8 +103,8 @@ case "${BUILD_TARGET}" in
135103

136104
;;
137105

138-
nrf52840)
139-
.travis/prepare_nrf52840.sh
106+
nrf52840-lock-example)
107+
.travis/prepare_nrf52840_lock_example.sh
140108

141109
;;
142110

‎.travis/build_nrf52840.sh‎ renamed to ‎.travis/build_nrf52840_lock_example.sh‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,6 @@
2121
# Travis CI build script for nRF52840 integration builds.
2222
#
2323

24-
# Export NRF5_SDK_ROOT variable pointing to the nRF5x SDK for Thread and Zigbee.
25-
export NRF5_SDK_ROOT=${TRAVIS_BUILD_DIR}/nRF5x-SDK-for-Thread-and-Zigbee
26-
27-
# Export NRF5_TOOLS_ROOT variable pointing to the nRF5x command line tools.
28-
export NRF5_TOOLS_ROOT=${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools
29-
30-
# Export GNU_INSTALL_ROOT variable pointing to the ARM GCC tool chain.
31-
export GNU_INSTALL_ROOT=${TRAVIS_BUILD_DIR}/arm/gcc-arm-none-eabi-7-2018-q2-update/bin/
32-
3324
# Export GNU_VERSION variable.
3425
export GNU_VERSION=7.3.1
3526

‎.travis/prepare_nrf52840.sh‎ renamed to ‎.travis/prepare_nrf52840_lock_example.sh‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,8 @@
2323

2424
TMPDIR=${TMPDIR-/tmp}
2525

26-
# Set tools download links
27-
#
28-
NORDIC_SDK_FOR_THREAD_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/SDKs/nRF5-SDK-for-Thread/nRF5-SDK-for-Thread-and-Zigbee/nRF5SDKforThreadandZigbeev300d310e71.zip
29-
NORDIC_COMMAND_LINE_TOOLS_URL=https://www.nordicsemi.com/-/media/Software-and-other-downloads/Desktop-software/nRF5-command-line-tools/sw/nRF-Command-Line-Tools_9_8_1_Linux-x86_64.tar
30-
ARM_GCC_TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
31-
32-
# --------------------------------------------------------------------------------
33-
3426
set -x
3527

36-
# Install Nordic nRF52840 SDK for Thread and Zigbee
37-
#
38-
wget -O ${TMPDIR}/nordic_sdk_for_thread.zip -nv ${NORDIC_SDK_FOR_THREAD_URL} || exit 1
39-
unzip -d ${TRAVIS_BUILD_DIR}/nRF5x-SDK-for-Thread-and-Zigbee -q ${TMPDIR}/nordic_sdk_for_thread.zip || exit 1
40-
rm ${TMPDIR}/nordic_sdk_for_thread.zip
41-
42-
# Install Nordic nRF5x Command Line Tools
43-
#
44-
wget -O ${TMPDIR}/nordic_command_line_tools.tar -nv ${NORDIC_COMMAND_LINE_TOOLS_URL} || exit 1
45-
mkdir ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools
46-
tar -C ${TRAVIS_BUILD_DIR}/nRF5x-Command-Line-Tools -xf ${TMPDIR}/nordic_command_line_tools.tar || exit 1
47-
rm ${TMPDIR}/nordic_command_line_tools.tar
48-
49-
# Install ARM GCC Toolchain
50-
#
51-
wget -O ${TMPDIR}/arm_gcc_toolchain.tar.bz2 -nv ${ARM_GCC_TOOLCHAIN_URL} || exit 1
52-
mkdir ${TRAVIS_BUILD_DIR}/arm
53-
tar -jxf ${TMPDIR}/arm_gcc_toolchain.tar.bz2 --directory ${TRAVIS_BUILD_DIR}/arm || exit 1
54-
rm ${TMPDIR}/arm_gcc_toolchain.tar.bz2
55-
5628
# Clone the openweave-nrf52840-lock-example application. This code will be used to
5729
# test the ability to build OpenWeave for the nRF52840.
5830
#
@@ -71,6 +43,10 @@ if git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example rev-parse --verify
7143
fi
7244
EXAMPLE_APP_BRANCH=`git -C ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example rev-parse --abbrev-ref HEAD`
7345

46+
# Call the prepare script in the lock example repo to install related
47+
# dependencies.
48+
source ${TRAVIS_BUILD_DIR}/openweave-nrf52840-lock-example/.travis/prepare.sh
49+
7450
# Initialize and update all submodules within the example app EXCEPT the
7551
# OpenWeave submodule.
7652
#
@@ -87,7 +63,7 @@ echo 'nRF52840 Build Preparation Complete'
8763
echo ''
8864
echo "openweave-core branch: ${TRAVIS_BRANCH}"
8965
echo "openweave-nrf52840-lock-example branch: ${EXAMPLE_APP_BRANCH}"
90-
echo "Nordic SDK for Thread and Zigbee: ${NORDIC_SDK_FOR_THREAD_URL}"
66+
echo "Nordic SDK for Thread and Zigbee: ${NORDIC_SDK_URL}"
9167
echo "Nordic nRF5x Command Line Tools: ${NORDIC_COMMAND_LINE_TOOLS_URL}"
9268
echo "ARM GCC Toolchain: ${ARM_GCC_TOOLCHAIN_URL}"
9369
echo 'Commit Hashes'

‎.travis/script.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#
2020
# Description:
21-
# This file is the script for Travis CI hosted, distributed continuous
21+
# This file is the script for Travis CI hosted, distributed continuous
2222
# integration 'script' step.
2323
#
2424

@@ -97,8 +97,8 @@ case "${BUILD_TARGET}" in
9797
.travis/build_esp32.sh
9898
;;
9999

100-
nrf52840)
101-
.travis/build_nrf52840.sh
100+
nrf52840-lock-example)
101+
.travis/build_nrf52840_lock_example.sh
102102
;;
103103

104104
linux-auto-*-distcheck)
@@ -112,6 +112,6 @@ case "${BUILD_TARGET}" in
112112
*)
113113
die "Unknown build target \"${BUILD_TARGET}\"."
114114
;;
115-
115+
116116
esac
117117

‎Makefile.am‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -28,59 +28,59 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
2828

2929
.NOTPARALLEL:
3030

31-
AM_MAKEFLAGS = --no-print-directory
31+
AM_MAKEFLAGS = --no-print-directory
3232

33-
SUBDIRS = \
34-
third_party \
35-
src \
36-
doc \
33+
SUBDIRS = \
34+
third_party \
35+
src \
36+
doc \
3737
$(NULL)
3838

39-
PRETTY_SUBDIRS = \
40-
$(filter-out third_party,$(SUBDIRS)) \
39+
PRETTY_SUBDIRS = \
40+
$(filter-out third_party,$(SUBDIRS)) \
4141
$(NULL)
4242

43-
EXTRA_DIST = \
44-
BUILDING-ESP32.md \
45-
BUILDING.md \
46-
CONTRIBUTING.md \
47-
Makefile-Android \
48-
Makefile-bootstrap \
49-
Makefile-iOS \
50-
Makefile-Standalone \
51-
README.md \
52-
.default-version \
53-
.travis.yml \
54-
.travis/before_install.sh \
55-
.travis/build_esp32.sh \
56-
.travis/build_nrf52840.sh \
57-
.travis/prepare_esp32.sh \
58-
.travis/prepare_nrf52840.sh \
59-
.travis/script.sh \
60-
bootstrap \
61-
bootstrap-configure \
62-
repos.conf \
63-
$(srcdir)/build/autoconf \
64-
$(srcdir)/build/config \
65-
$(srcdir)/build/cstyle/cstyle.options \
66-
$(srcdir)/build/esp32 \
67-
$(srcdir)/build/jenkins \
68-
$(srcdir)/build/make \
69-
$(srcdir)/build/scripts \
70-
$(srcdir)/certs \
43+
EXTRA_DIST = \
44+
BUILDING-ESP32.md \
45+
BUILDING.md \
46+
CONTRIBUTING.md \
47+
Makefile-Android \
48+
Makefile-bootstrap \
49+
Makefile-iOS \
50+
Makefile-Standalone \
51+
README.md \
52+
.default-version \
53+
.travis.yml \
54+
.travis/before_install.sh \
55+
.travis/build_esp32.sh \
56+
.travis/build_nrf52840_lock_example.sh \
57+
.travis/prepare_esp32.sh \
58+
.travis/prepare_nrf52840_lock_example.sh \
59+
.travis/script.sh \
60+
bootstrap \
61+
bootstrap-configure \
62+
repos.conf \
63+
$(srcdir)/build/autoconf \
64+
$(srcdir)/build/config \
65+
$(srcdir)/build/cstyle/cstyle.options \
66+
$(srcdir)/build/esp32 \
67+
$(srcdir)/build/jenkins \
68+
$(srcdir)/build/make \
69+
$(srcdir)/build/scripts \
70+
$(srcdir)/certs \
7171
$(NULL)
7272

73-
BUILT_SOURCES = \
74-
.local-version \
73+
BUILT_SOURCES = \
74+
.local-version \
7575
$(NULL)
7676

77-
dist_doc_DATA = \
78-
CHANGELOG \
79-
LICENSE \
77+
dist_doc_DATA = \
78+
CHANGELOG \
79+
LICENSE \
8080
$(NULL)
8181

82-
DISTCLEANFILES = \
83-
.local-version \
82+
DISTCLEANFILES = \
83+
.local-version \
8484
$(NULL)
8585

8686
# There are no source files to lint or prettify in this subdirectory.

‎Makefile.in‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -549,56 +549,56 @@ top_builddir = @top_builddir@
549549
top_srcdir = @top_srcdir@
550550
AM_MAKEFLAGS = --no-print-directory
551551
SUBDIRS = \
552-
third_party \
553-
src \
554-
doc \
552+
third_party \
553+
src \
554+
doc \
555555
$(NULL)
556556

557557
PRETTY_SUBDIRS = \
558-
$(filter-out third_party,$(SUBDIRS)) \
558+
$(filter-out third_party,$(SUBDIRS)) \
559559
$(NULL)
560560

561561
EXTRA_DIST = \
562-
BUILDING-ESP32.md \
563-
BUILDING.md \
564-
CONTRIBUTING.md \
565-
Makefile-Android \
566-
Makefile-bootstrap \
567-
Makefile-iOS \
568-
Makefile-Standalone \
569-
README.md \
570-
.default-version \
571-
.travis.yml \
572-
.travis/before_install.sh \
573-
.travis/build_esp32.sh \
574-
.travis/build_nrf52840.sh \
575-
.travis/prepare_esp32.sh \
576-
.travis/prepare_nrf52840.sh \
577-
.travis/script.sh \
578-
bootstrap \
579-
bootstrap-configure \
580-
repos.conf \
581-
$(srcdir)/build/autoconf \
582-
$(srcdir)/build/config \
583-
$(srcdir)/build/cstyle/cstyle.options \
584-
$(srcdir)/build/esp32 \
585-
$(srcdir)/build/jenkins \
586-
$(srcdir)/build/make \
587-
$(srcdir)/build/scripts \
588-
$(srcdir)/certs \
562+
BUILDING-ESP32.md \
563+
BUILDING.md \
564+
CONTRIBUTING.md \
565+
Makefile-Android \
566+
Makefile-bootstrap \
567+
Makefile-iOS \
568+
Makefile-Standalone \
569+
README.md \
570+
.default-version \
571+
.travis.yml \
572+
.travis/before_install.sh \
573+
.travis/build_esp32.sh \
574+
.travis/build_nrf52840_lock_example.sh \
575+
.travis/prepare_esp32.sh \
576+
.travis/prepare_nrf52840_lock_example.sh \
577+
.travis/script.sh \
578+
bootstrap \
579+
bootstrap-configure \
580+
repos.conf \
581+
$(srcdir)/build/autoconf \
582+
$(srcdir)/build/config \
583+
$(srcdir)/build/cstyle/cstyle.options \
584+
$(srcdir)/build/esp32 \
585+
$(srcdir)/build/jenkins \
586+
$(srcdir)/build/make \
587+
$(srcdir)/build/scripts \
588+
$(srcdir)/certs \
589589
$(NULL)
590590

591591
BUILT_SOURCES = \
592-
.local-version \
592+
.local-version \
593593
$(NULL)
594594

595595
dist_doc_DATA = \
596-
CHANGELOG \
597-
LICENSE \
596+
CHANGELOG \
597+
LICENSE \
598598
$(NULL)
599599

600600
DISTCLEANFILES = \
601-
.local-version \
601+
.local-version \
602602
$(NULL)
603603

604604

0 commit comments

Comments
 (0)