Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to Zephyr SDK 0.16.3 #138

Merged
merged 10 commits into from
Oct 9, 2023
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dockerfile": "Dockerfile",
// Specify version for Zephyr Container
// See https://github.com/zephyrproject-rtos/docker-image/releases
"args": { "ZEPHYR_TAG": "v0.26.4" }
"args": { "ZEPHYR_TAG": "v0.26.5" }
},
// Needed for USB devices in container
"privileged": true,
Expand Down Expand Up @@ -33,4 +33,4 @@
]
}
}
}
}
10 changes: 5 additions & 5 deletions .github/workflows/qa-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
name: Run integration tests for samples
runs-on: ubuntu-latest
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
options: '--entrypoint /bin/bash'
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3

steps:
- name: Apply container owner mismatch workaround
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Convert integration test reports to annotations
uses: mikepenz/action-junit-report@v3
with:
check_name: twister-report (shields)
check_name: twister-report (samples)
report_paths: "**/twister-out/twister.xml"
require_tests: true
fail_on_failure: false
Expand All @@ -124,10 +124,10 @@ jobs:
name: Run integration tests for shields
runs-on: ubuntu-latest
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.4
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
options: '--entrypoint /bin/bash'
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3

steps:
- name: Apply container owner mismatch workaround
Expand Down
2 changes: 2 additions & 0 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ function(add_docset name sphinxopts)
-DDOXY_OUT="${DOCSET_DOXY_DIR}"
-DDOXY_IN="${SHARED_DOXYGEN_DIR}"
-DDOXY_LAYOUT="standalone"
-DDOXY_LOGOUT="${DOCSET_DOXY_DIR}"
-DDOXY_LOGWRN="warnings.txt"
-DPROJECT_DOXY="${PROJECT_DOXYGEN_DIR}"
-DPROJECT_BASE=${DOCSET_BASE}
-DPROJECT_NAME="${DOCSET_NAME}"
Expand Down
9 changes: 5 additions & 4 deletions doc/_doxygen/doxyfile-bridle.in
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ SHORT_NAMES = NO
# description.)
# The default value is: NO.

JAVADOC_AUTOBRIEF = NO
JAVADOC_AUTOBRIEF = YES

# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
# such as
Expand All @@ -195,7 +195,7 @@ JAVADOC_BANNER = NO
# requiring an explicit \brief command for a brief description.)
# The default value is: NO.

QT_AUTOBRIEF = NO
QT_AUTOBRIEF = YES

# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
Expand Down Expand Up @@ -863,7 +863,7 @@ WARN_FORMAT = "$file:$line: $text"
# messages should be written. If left blank the output is written to standard
# error (stderr).

WARN_LOGFILE = "@DOXY_OUT@/warnings.txt"
WARN_LOGFILE = "@DOXY_LOGOUT@/@DOXY_LOGWRN@"

#---------------------------------------------------------------------------
# Configuration options related to the input files
Expand Down Expand Up @@ -2273,6 +2273,8 @@ PREDEFINED = __DOXYGEN__ \
CONFIG_HEAP_MEM_POOL_SIZE \
CONFIG_MMU \
CONFIG_NET_L2_ETHERNET_MGMT \
CONFIG_NET_L2_IEEE802154_MGMT \
CONFIG_NET_L2_IEEE802154_SECURITY \
CONFIG_NET_MGMT_EVENT \
CONFIG_NET_SOCKETS_POSIX_NAMES \
CONFIG_NET_TCP \
Expand All @@ -2282,7 +2284,6 @@ PREDEFINED = __DOXYGEN__ \
CONFIG_SCHED_DEADLINE \
CONFIG_SETTINGS_RUNTIME \
CONFIG_SMP \
CONFIG_SPI_ASYNC \
CONFIG_SYS_CLOCK_EXISTS \
CONFIG_THREAD_CUSTOM_DATA \
CONFIG_THREAD_MONITOR \
Expand Down
9 changes: 5 additions & 4 deletions doc/_doxygen/doxyfile-zephyr.in
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ SHORT_NAMES = NO
# description.)
# The default value is: NO.

JAVADOC_AUTOBRIEF = NO
JAVADOC_AUTOBRIEF = YES

# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
# such as
Expand All @@ -195,7 +195,7 @@ JAVADOC_BANNER = NO
# requiring an explicit \brief command for a brief description.)
# The default value is: NO.

QT_AUTOBRIEF = NO
QT_AUTOBRIEF = YES

# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
Expand Down Expand Up @@ -863,7 +863,7 @@ WARN_FORMAT = "$file:$line: $text"
# messages should be written. If left blank the output is written to standard
# error (stderr).

WARN_LOGFILE = "@DOXY_OUT@/warnings.txt"
WARN_LOGFILE = "@DOXY_LOGOUT@/@DOXY_LOGWRN@"

#---------------------------------------------------------------------------
# Configuration options related to the input files
Expand Down Expand Up @@ -2276,6 +2276,8 @@ PREDEFINED = __DOXYGEN__ \
CONFIG_HEAP_MEM_POOL_SIZE \
CONFIG_MMU \
CONFIG_NET_L2_ETHERNET_MGMT \
CONFIG_NET_L2_IEEE802154_MGMT \
CONFIG_NET_L2_IEEE802154_SECURITY \
CONFIG_NET_MGMT_EVENT \
CONFIG_NET_SOCKETS_POSIX_NAMES \
CONFIG_NET_TCP \
Expand All @@ -2285,7 +2287,6 @@ PREDEFINED = __DOXYGEN__ \
CONFIG_SCHED_DEADLINE \
CONFIG_SETTINGS_RUNTIME \
CONFIG_SMP \
CONFIG_SPI_ASYNC \
CONFIG_SYS_CLOCK_EXISTS \
CONFIG_THREAD_CUSTOM_DATA \
CONFIG_THREAD_MONITOR \
Expand Down
4 changes: 4 additions & 0 deletions doc/bridle/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import utils

ZEPHYR_BASE = utils.get_projdir('zephyr')
BRIDLE_WORKD = os.path.join(utils.get_builddir(), 'bridle')

# Add the '_extensions' directory to sys.path, to enable finding Bridle's
# Sphinx extensions within.
Expand Down Expand Up @@ -78,6 +79,7 @@
logcfg.info(project + ' ' + release, color='yellow')
logcfg.info('Build with tags: ' + ':'.join(map(str, tags)), color='red')
logcfg.info('BRIDLE_BASE is: "{}"'.format(BRIDLE_BASE), color='green')
logcfg.info('BRIDLE_WORKD is: "{}"'.format(BRIDLE_WORKD), color='yellow')
logcfg.info('BRIDLE_BUILD is: "{}"'.format(BRIDLE_BUILD), color='yellow')
logcfg.info('ZEPHYR_BASE is: "{}"'.format(ZEPHYR_BASE), color='green')

Expand Down Expand Up @@ -241,6 +243,8 @@
'DOXY_SET': u'bridle',
'DOXY_IN': str(Path(doxyrunner_doxyfile).absolute().parent),
'DOXY_LAYOUT': u'zephyr-doxyrunner',
'DOXY_LOGOUT': str(Path(BRIDLE_WORKD).absolute()),
'DOXY_LOGWRN': u'doxygen-warnings.txt',
'PROJECT_DOXY': str(Path(doxyrunner_doxydir).absolute()),
'PROJECT_BASE': str(BRIDLE_BASE),
'PROJECT_NAME': project,
Expand Down
3 changes: 3 additions & 0 deletions doc/bridle/releases/release-notes-3.5.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ Take over the new build principles from Zephyr:
* Remove all specific ``@uartcons`` board revisions.
* Convert all active test cases to use the new Twister CLI argument
``--alt-config-root``. Also remove the abandoned shield ``can_timing_adj``.
* Updated Zephyr SDK to 0.16.3. Use Zephyr CI container v0.26.5 on GitHub CI
and as base image for local developer container in Vidual Studio Code.

Documentation
=============
Expand All @@ -166,6 +168,7 @@ Issue Related Items

These GitHub issues were addressed since project bootstrapping:

* :github:`136` - [FCR] Bump to Zephyr SDK 0.16.3
* :github:`128` - [FER] Provide USB console by snippets instead of specific board revision
* :github:`127` - [FER] Provide CAN timing tweak for TiaC Magpie by snippets instead of a shield
* :github:`125` - [BUG] Nightly QA integration test fails (convert to ``stm32-bxcan``)
Expand Down
13 changes: 7 additions & 6 deletions doc/zephyr/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import utils

ZEPHYR_BASE = utils.get_projdir('zephyr')
BRIDLE_ZEPHYR_BUILD = os.path.join(utils.get_builddir(), 'zephyr')
ZEPHYR_WORKD = os.path.join(utils.get_builddir(), 'zephyr')

# Add the '_extensions' directory to sys.path, to enable finding Bridle's
# Sphinx extensions within.
Expand Down Expand Up @@ -93,9 +93,8 @@
logcfg.info('Build with tags: ' + ':'.join(map(str, tags)), color='red')
logcfg.info('BRIDLE_BASE is: "{}"'.format(BRIDLE_BASE), color='green')
logcfg.info('ZEPHYR_BASE is: "{}"'.format(ZEPHYR_BASE), color='green')
logcfg.info('ZEPHYR_BUILD is: "{}"'.format(ZEPHYR_BASE), color='yellow')
logcfg.info('BRIDLE_ZEPHYR_BUILD is: "{}"'.format(BRIDLE_ZEPHYR_BUILD),
color='yellow')
logcfg.info('ZEPHYR_WORKD is: "{}"'.format(ZEPHYR_WORKD), color='yellow')
logcfg.info('ZEPHYR_BUILD is: "{}"'.format(ZEPHYR_BUILD), color='yellow')

# General ----------------------------------------------------------------------

Expand Down Expand Up @@ -207,6 +206,8 @@
'DOXY_SET': u'zephyr',
'DOXY_IN': str(Path(doxyrunner_doxyfile).absolute().parent),
'DOXY_LAYOUT': u'zephyr-doxyrunner',
'DOXY_LOGOUT': str(Path(ZEPHYR_WORKD).absolute()),
'DOXY_LOGWRN': u'doxygen-warnings.txt',
'PROJECT_DOXY': str(Path(doxyrunner_doxydir).absolute()),
'PROJECT_BASE': str(ZEPHYR_BASE),
'PROJECT_NAME': project,
Expand All @@ -222,7 +223,7 @@

# Options for zephyr.warnings_filter -------------------------------------------

warnings_filter_config = os.path.join(BRIDLE_ZEPHYR_BUILD, 'known-warnings.txt')
warnings_filter_config = os.path.join(ZEPHYR_WORKD, 'known-warnings.txt')
warnings_filter_silent = True

# -- Options for notfound.extension --------------------------------------------
Expand Down Expand Up @@ -264,7 +265,7 @@ def update_inventory_warnings_filter_config(app):
if "warnings_filter_config" in app.config:
# Update the warnings_filter_config value.
app.config.warnings_filter_config = os.path.join(
BRIDLE_ZEPHYR_BUILD, 'known-warnings-inventory.txt'
ZEPHYR_WORKD, 'known-warnings-inventory.txt'
)

def update_config(app):
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools-versions-linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ openocd=0.11.0-5 (xPack OpenOCD from GitHub)
ccache=3.7.7-1
dfu-util=0.9-1
west=0.14.0
zephyr-sdk=0.16.1
zephyr-sdk=0.16.3
doxygen=1.9.2-1+ppa~tsn1~focal
graphviz=2.42.2-3build2
mscgen=0.20-12
2 changes: 1 addition & 1 deletion scripts/tools-versions-macos.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ gperf=3.1;hash=258483ea2fd445d42d869d495504f960202fe0c3
dtc=1.4.7;hash=0747cc9d6b50ac8a3b1b576e4509494f2258aef2
openocd=0.11.0-5 (xPack OpenOCD from GitHub)
west=0.14.0
zephyr-sdk=0.16.1
zephyr-sdk=0.16.3
2 changes: 1 addition & 1 deletion scripts/tools-versions-minimum.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ gperf=3.1
dtc=1.4.6
openocd=0.11
west=0.12
zephyr-sdk=0.15.1
zephyr-sdk=0.16.1
gnuarmemb=10-2020-q4-major
doxygen=1.9.1
graphviz=2.42
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools-versions-win10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ gperf=3.1
dtc=1.4.7-1
openocd=0.11.0-5 (xPack OpenOCD from GitHub)
west=0.14.0
zephyr-sdk=0.16.1
zephyr-sdk=0.16.3
Loading