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.

Sign up for GitHub

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 v0.16.5 #193

Merged
merged 4 commits into from
Feb 6, 2024
Merged

Bump to Zephyr SDK v0.16.5 #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e25be99
cmake: bump to required Zephyr SDK v0.16.5
rexut Feb 6, 2024
b970863
ci: github: bump Zephyr CI container to v0.26.7
rexut Feb 6, 2024
b7f49fc
ci: github: disable integration tests on targets
rexut Feb 6, 2024
670cb13
release: add draft notes for upcoming 3.6.0
rexut Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 56 additions & 52 deletions .github/workflows/qa-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
if: github.repository_owner == 'tiacsys'
runs-on: [self-hosted, ci-32g-x8, linux, x64, container]
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
image: ghcr.io/zephyrproject-rtos/ci:v0.26.7
options: '--cpus 4 --memory 8g --entrypoint /bin/bash'
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.5

steps:
- name: Apply container owner mismatch workaround
Expand Down Expand Up @@ -153,10 +153,10 @@ jobs:
if: github.repository_owner == 'tiacsys'
runs-on: [self-hosted, ci-32g-x8, linux, x64, container]
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
image: ghcr.io/zephyrproject-rtos/ci:v0.26.7
options: '--cpus 4 --memory 8g --entrypoint /bin/bash'
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.5

steps:
- name: Apply container owner mismatch workaround
Expand Down Expand Up @@ -338,51 +338,55 @@ jobs:
pip3 install --upgrade --requirement zephyr/scripts/requirements-compliance.txt
pip3 install --upgrade --requirement bridle/scripts/requirements-build.txt

- name: Execute integration tests on target
working-directory: workspace
env:
HARDWARE_MAP: bridle/.github/${{ github.job }}/map-${{ matrix.board }}.yml
run: |
#
# Disabled in the meantime because the execution time is still
# too high and most of the core tests are already performed by
# Zephyr in any case:
#
# --tag arm \
# --tag vector_relay \
# --tag kernel \
#
west twister --verbose --jobs 4 \
--retry-failed 5 --retry-interval 60 \
--outdir twister-out --no-clean --inline-logs \
--enable-size-report --platform-reports \
--device-testing --hardware-map ${HARDWARE_MAP} \
--extra-args SHIELD="loopback_test_tmph" \
--alt-config-root bridle/zephyr/alt-config \
--testsuite-root bridle/tests \
--testsuite-root zephyr/tests \
--tag bridle \
--tag hwinfo \
--tag random \
--tag entropy \
--tag watchdog \
--tag counter \
--tag gpio \
--tag spi \
--tag uart \
--tag can

- name: Upload integration test results
uses: actions/upload-artifact@v3
with:
name: twister-targets.xml
path: workspace/twister-out/twister.xml

- name: Convert integration test reports to annotations
uses: mikepenz/action-junit-report@v3
with:
check_name: twister-report (${{ matrix.board }})
report_paths: "**/twister-out/twister.xml"
require_tests: true
fail_on_failure: false
if: always()
#
# TODO: Disabled, as long as required Zephyr SDK version isn't
# available for ARM 64-bit architectures (AArch64).
#
### OFF ### - name: Execute integration tests on target
### OFF ### working-directory: workspace
### OFF ### env:
### OFF ### HARDWARE_MAP: bridle/.github/${{ github.job }}/map-${{ matrix.board }}.yml
### OFF ### run: |
### OFF ### #
### OFF ### # Disabled in the meantime because the execution time is still
### OFF ### # too high and most of the core tests are already performed by
### OFF ### # Zephyr in any case:
### OFF ### #
### OFF ### # --tag arm \
### OFF ### # --tag vector_relay \
### OFF ### # --tag kernel \
### OFF ### #
### OFF ### west twister --verbose --jobs 4 \
### OFF ### --retry-failed 5 --retry-interval 60 \
### OFF ### --outdir twister-out --no-clean --inline-logs \
### OFF ### --enable-size-report --platform-reports \
### OFF ### --device-testing --hardware-map ${HARDWARE_MAP} \
### OFF ### --extra-args SHIELD="loopback_test_tmph" \
### OFF ### --alt-config-root bridle/zephyr/alt-config \
### OFF ### --testsuite-root bridle/tests \
### OFF ### --testsuite-root zephyr/tests \
### OFF ### --tag bridle \
### OFF ### --tag hwinfo \
### OFF ### --tag random \
### OFF ### --tag entropy \
### OFF ### --tag watchdog \
### OFF ### --tag counter \
### OFF ### --tag gpio \
### OFF ### --tag spi \
### OFF ### --tag uart \
### OFF ### --tag can
### OFF ###
### OFF ### - name: Upload integration test results
### OFF ### uses: actions/upload-artifact@v3
### OFF ### with:
### OFF ### name: twister-targets.xml
### OFF ### path: workspace/twister-out/twister.xml
### OFF ###
### OFF ### - name: Convert integration test reports to annotations
### OFF ### uses: mikepenz/action-junit-report@v3
### OFF ### with:
### OFF ### check_name: twister-report (${{ matrix.board }})
### OFF ### report_paths: "**/twister-out/twister.xml"
### OFF ### require_tests: true
### OFF ### fail_on_failure: false
### OFF ### if: always()
1 change: 1 addition & 0 deletions doc/bridle/releases/release-notes-3.6.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ Issue Related Items

These GitHub issues were addressed since project bootstrapping:

* :github:`192` - [FCR] Upgrade to Zephyr SDK 0.16.5
* :github:`187` - [BUG] ubx_gnss sample fails to build
* :github:`185` - [HW] Waveshare Pico 10-DOF IMU Sensor
* :github:`183` - [HW] Waveshare Pico RGB LED
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools-versions-linux.txt
View file
Open in desktop
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.4
zephyr-sdk=0.16.5
doxygen=1.9.8-1+ppa~tsn1~focal
graphviz=2.42.2-3build2
mscgen=0.20-12
2 changes: 1 addition & 1 deletion scripts/tools-versions-macos.txt
View file
Open in desktop
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.4
zephyr-sdk=0.16.5
2 changes: 1 addition & 1 deletion scripts/tools-versions-minimum.txt
View file
Open in desktop
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.16.1
zephyr-sdk=0.16.5
gnuarmemb=10-2020-q4-major
doxygen=1.9.2
graphviz=2.42
Expand Down
2 changes: 1 addition & 1 deletion scripts/tools-versions-win10.txt
View file
Open in desktop
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.4
zephyr-sdk=0.16.5
Loading