Skip to content

Commit

Permalink
Update to Firmware SDK v0.16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkoPura authored Dec 30, 2024
2 parents db9444d + 73964ba commit 27827cd
Show file tree
Hide file tree
Showing 34 changed files with 577 additions and 385 deletions.
24 changes: 17 additions & 7 deletions .github/workflows/build_zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@ jobs:
uses: actions/checkout@v4
with:
path: app

- name: Process Board name
id: nicename
shell: bash
run: |
BOARD_NICENAME=${{ inputs.BOARD }}
BOARD_NICENAME=${BOARD_NICENAME//\//_}
echo "BOARD_NICENAME=${BOARD_NICENAME}" >> $GITHUB_OUTPUT
- name: Setup West workspace
run: |
west init -l app
Expand All @@ -60,23 +69,24 @@ jobs:
- name: Build with West
run: |
west build -p -b ${{ inputs.BOARD }} app
west build -p -b ${{ inputs.BOARD }} --sysbuild app
- name: Prepare artifacts
shell: bash
if: inputs.ARTIFACT == true && inputs.TAG != ''

run: |
cd build/zephyr
cd build
mkdir -p artifacts
mv merged.hex ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ inputs.BOARD }}_full.hex
mv app_update.bin ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ inputs.BOARD }}_update.bin
mv zephyr.elf ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ inputs.BOARD }}.elf
mv merged.hex ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ steps.nicename.outputs.BOARD_NICENAME }}_full.hex
mv app/zephyr/zephyr.signed.bin ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ steps.nicename.outputs.BOARD_NICENAME }}_update.bin
mv app/zephyr/zephyr.elf ./artifacts/golioth-${{ github.event.repository.name }}_${{ inputs.TAG }}_${{ steps.nicename.outputs.BOARD_NICENAME }}.elf
# Run IDs are unique per repo but are reused on re-runs
- name: Save artifact
if: inputs.ARTIFACT == true
uses: actions/upload-artifact@v4
with:
name: build_artifacts_${{ github.run_id }}
name: build_artifacts_${{ github.run_id }}_${{ steps.nicename.outputs.BOARD_NICENAME }}
path: |
build/zephyr/artifacts/*
build/artifacts/*
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
version:
description: 'Release Version.'
required: true
default: 'v0.0.0'
default: 'template_v0.0.0'
type: string

jobs:
Expand Down Expand Up @@ -38,8 +38,9 @@ jobs:
- name: Download artifact
uses: actions/download-artifact@v4
with:
name: build_artifacts_${{ github.run_id }}
pattern: build_artifacts_*
path: ~/artifacts
merge-multiple: true

- name: Create Release manually with GH CLI
run: gh release create --title ${{ inputs.version }} --draft ${{ inputs.version }}
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,18 @@ on:
pull_request:

push:
branches: [ main ]

jobs:
test_build:
test_build_nrf52840dk:
uses: ./.github/workflows/build_zephyr.yml
with:
ZEPHYR_SDK: 0.16.3
BOARD: nrf52840dk_nrf52840
BOARD: nrf52840dk/nrf52840
ARTIFACT: false
test_build_adafruit_feather_nrf52840:
uses: ./.github/workflows/build_zephyr.yml
with:
ZEPHYR_SDK: 0.16.3
BOARD: adafruit_feather_nrf52840
ARTIFACT: false
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,26 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.1.0] - TBD

### Added

- Pipeline example

### Changed

- Merge changes from
[`golioth/reference-design-template@template_v2.5.0`](https://github.com/golioth/reference-design-template/tree/template_v2.5.0).
- Use `--sysbuild` for all boards.
- Use static partition table.
- Update board names for Zephyr hardware model v2
- Use `VERSION` file instead of `prj.conf` to set firmware version

## [1.0.0] - 2024-06-11

### Added

- Use of comercialy available GL-S200 Thread Border Router
- Added support for Adafruit Feather nRF52840 Express board
- Based on the [Reference Design Template](https://github.com/golioth/reference-design-template)
- Added a CHANGELOG.md to track changes moving forward.

2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@ target_sources(app PRIVATE src/app_rpc.c)
target_sources(app PRIVATE src/app_settings.c)
target_sources(app PRIVATE src/app_state.c)
target_sources(app PRIVATE src/app_sensors.c)

add_subdirectory_ifdef(CONFIG_ALUDEL_BATTERY_MONITOR src/battery_monitor)
Loading

0 comments on commit 27827cd

Please sign in to comment.