Skip to content

Commit 59e0079

Browse files
committed
workflows: Cleanup
* Remove unused files and workflows * Change references to Asset Tracker Template Signed-off-by: Jan Tore Guggedal <jantore.guggedal@nordicsemi.no>
1 parent d0446b7 commit 59e0079

14 files changed

+58
-845
lines changed

.github/workflows/attach_release_assets.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
build_bl_update: true
1818
build_debug: true
19-
memfault_sw_type: "hello.nrfcloud.com"
19+
memfault_sw_type: "asset-tracker-template"
2020

2121
attach-assets:
2222
runs-on: ubuntu-24.04
@@ -36,10 +36,8 @@ jobs:
3636
with:
3737
fail_on_unmatched_files: true
3838
files: |
39-
hello.nrfcloud.com-*.*
40-
connectivity-bridge*.*
39+
asset-tracker-template-*.*
4140
nrf91-bl-*.hex
42-
nrf53-bl-*.hex
4341
4442
- name: Trigger workflow that publishes firmware bundles to nRF Cloud
4543
working-directory: .github/workflows

.github/workflows/build.yml

+40-131
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ name: Build
33
on:
44
workflow_dispatch:
55
inputs:
6-
build_bl_update:
7-
description: Build bootloader update
8-
type: boolean
9-
required: false
10-
default: false
116
build_debug:
127
type: boolean
138
required: false
@@ -21,7 +16,7 @@ on:
2116
memfault_sw_type:
2217
type: string
2318
required: false
24-
default: "hello.nrfcloud.com-ci"
19+
default: "asset-tracker-template-ci"
2520
build_debug:
2621
type: boolean
2722
required: false
@@ -58,27 +53,17 @@ jobs:
5853
- name: Checkout
5954
uses: actions/checkout@v4
6055
with:
61-
path: thingy91x-oob
56+
path: asset-tracker-template
6257

6358
- name: Initialize
64-
working-directory: thingy91x-oob
59+
working-directory: asset-tracker-template
6560
run: |
6661
west init -l .
6762
west config manifest.group-filter +bsec
6863
west config build.sysbuild True
6964
west update -o=--depth=1 -n
7065
west blobs fetch hal_nordic
7166
72-
- uses: robinraju/release-downloader@v1
73-
with:
74-
tag: 'v2.0.0-preview58'
75-
fileName: 'nrf53-bl-v3-*.hex'
76-
77-
- uses: robinraju/release-downloader@v1
78-
with:
79-
tag: 'v2.0.0-preview58'
80-
fileName: 'nrf91-bl-v2.hex'
81-
8267
- name: Install dependencies
8368
run: |
8469
pip install -r nrf/scripts/requirements-build.txt
@@ -94,99 +79,99 @@ jobs:
9479
9580
- name: Update VERSION file for release
9681
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
97-
working-directory: thingy91x-oob
82+
working-directory: asset-tracker-template
9883
run: |
9984
python3 scripts/app_version.py ${GITHUB_REF_NAME} > app/VERSION
10085
cat app/VERSION
10186
10287
- name: Set MEMFAULT_SW_TYPE from inputs or use default
10388
run: |
10489
if [ -z "${{ inputs.memfault_sw_type }}" ]; then
105-
echo "MEMFAULT_SW_TYPE=hello.nrfcloud.com-ci" >> $GITHUB_ENV
90+
echo "MEMFAULT_SW_TYPE=asset-tracker-template-ci" >> $GITHUB_ENV
10691
else
10792
echo "MEMFAULT_SW_TYPE=${{ inputs.memfault_sw_type }}" >> $GITHUB_ENV
10893
fi
10994
11095
# Out-of-box firmware build
11196

11297
- name: Build nrf91 firmware
113-
working-directory: thingy91x-oob/app
98+
working-directory: asset-tracker-template/app
11499
run: |
115-
cp overlay-memfault.conf overlay-memfault-oob.conf
116-
echo "CONFIG_MEMFAULT_NCS_PROJECT_KEY=\"${{ secrets.MEMFAULT_PROJECT_KEY }}\"" >> overlay-memfault-oob.conf
117-
echo CONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y >> overlay-memfault-oob.conf
118-
echo CONFIG_MEMFAULT_NCS_FW_VERSION=\"${{ env.VERSION }}\" >> overlay-memfault-oob.conf
119-
echo CONFIG_MEMFAULT_NCS_FW_TYPE=\"${{ env.MEMFAULT_SW_TYPE }}\" >> overlay-memfault-oob.conf
120-
west build -b thingy91x/nrf9151/ns -p --sysbuild -- -DEXTRA_CONF_FILE="overlay-memfault-oob.conf"
100+
cp overlay-memfault.conf overlay-memfault-att.conf
101+
echo "CONFIG_MEMFAULT_NCS_PROJECT_KEY=\"${{ secrets.MEMFAULT_PROJECT_KEY }}\"" >> overlay-memfault-att.conf
102+
echo CONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y >> overlay-memfault-att.conf
103+
echo CONFIG_MEMFAULT_NCS_FW_VERSION=\"${{ env.VERSION }}\" >> overlay-memfault-att.conf
104+
echo CONFIG_MEMFAULT_NCS_FW_TYPE=\"${{ env.MEMFAULT_SW_TYPE }}\" >> overlay-memfault-att.conf
105+
west build -b thingy91x/nrf9151/ns -p --sysbuild -- -DEXTRA_CONF_FILE="overlay-memfault-att.conf"
121106
122107
- name: Rename artifacts
123-
working-directory: thingy91x-oob/app/build
108+
working-directory: asset-tracker-template/app/build
124109
run: |
125110
cp ../../../nrf91-bl-*.hex .
126111
# Overwrite the bootloader part with the frozen version
127112
python3 ../../../zephyr/scripts/build/mergehex.py -o \
128-
hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91.hex \
113+
asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91.hex \
129114
merged.hex \
130115
nrf91-bl-*.hex \
131116
--overlap replace
132-
cp app/zephyr/.config hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91.config
133-
cp app/zephyr/zephyr.signed.bin hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91-update-signed.bin
134-
cp app/zephyr/zephyr.signed.hex hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91-update-signed.hex
135-
cp app/zephyr/zephyr.elf hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91.elf
136-
cp dfu_application.zip hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91-dfu.zip
117+
cp app/zephyr/.config asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91.config
118+
cp app/zephyr/zephyr.signed.bin asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91-update-signed.bin
119+
cp app/zephyr/zephyr.signed.hex asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91-update-signed.hex
120+
cp app/zephyr/zephyr.elf asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91.elf
121+
cp dfu_application.zip asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91-dfu.zip
137122
138123
- name: Create partition manager report for nRF91 firmware
139-
working-directory: thingy91x-oob/app/build
124+
working-directory: asset-tracker-template/app/build
140125
run: |
141126
ninja partition_manager_report
142127
ninja partition_manager_report > pmr-nrf91-default-${{ env.VERSION }}.txt
143128
sed -i '1d' pmr-nrf91-default-${{ env.VERSION }}.txt
144129
145130
- name: Upload artifact
146131
uses: actions/upload-artifact@v4
147-
id: artifact-upload-oob
132+
id: artifact-upload-att
148133
with:
149-
name: firmware-oob
134+
name: firmware-att
150135
if-no-files-found: error
151136
path: |
152-
thingy91x-oob/app/build/hello.nrfcloud.com-*.*
153-
thingy91x-oob/app/build/nrf91-bl-*.hex
154-
thingy91x-oob/app/build/pmr-nrf91-*.txt
137+
asset-tracker-template/app/build/asset-tracker-template-*.*
138+
asset-tracker-template/app/build/nrf91-bl-*.hex
139+
asset-tracker-template/app/build/pmr-nrf91-*.txt
155140
156-
# Out-of-box debug firmware build
141+
# Asset Tracker Template debug firmware build
157142

158143
- name: Build nrf91 debug firmware
159144
if: ${{ inputs.build_debug }}
160-
working-directory: thingy91x-oob/app
145+
working-directory: asset-tracker-template/app
161146
run: |
162147
cp overlay-memfault.conf overlay-memfault-debug.conf
163148
echo "CONFIG_MEMFAULT_NCS_PROJECT_KEY=\"${{ secrets.MEMFAULT_PROJECT_KEY }}\"" >> overlay-memfault-debug.conf
164149
echo CONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y >> overlay-memfault-debug.conf
165-
echo CONFIG_MEMFAULT_NCS_FW_VERSION=\"${{ env.VERSION }}+debug\" >> overlay-memfault-debug.conf
150+
echo CONFIG_MEMFAULT_NCS_FW_VERSION=\"${{ env.VERSION }}-debug\" >> overlay-memfault-debug.conf
166151
echo CONFIG_MEMFAULT_NCS_FW_TYPE=\"${{ env.MEMFAULT_SW_TYPE }}\" >> overlay-memfault-debug.conf
167152
echo CONFIG_APP_MEMFAULT_UPLOAD_METRICS_ON_CLOUD_READY=y >> overlay-memfault-debug.conf
168153
west build -p -b thingy91x/nrf9151/ns -p --sysbuild -- -DEXTRA_CONF_FILE="overlay-memfault-debug.conf;overlay-modemtrace-to-memfault.conf;overlay-etb.conf"
169154
170155
- name: Rename debug artifacts
171156
if: ${{ inputs.build_debug }}
172-
working-directory: thingy91x-oob/app/build
157+
working-directory: asset-tracker-template/app/build
173158
run: |
174159
cp ../../../nrf91-bl-*.hex .
175160
# Overwrite the bootloader part with the frozen version
176161
python3 ../../../zephyr/scripts/build/mergehex.py -o \
177-
hello.nrfcloud.com-${{ env.VERSION }}+debug-thingy91x-nrf91.hex \
162+
asset-tracker-template-${{ env.VERSION }}-debug-thingy91x-nrf91.hex \
178163
merged.hex \
179164
nrf91-bl-*.hex \
180165
--overlap replace
181-
cp app/zephyr/.config hello.nrfcloud.com-${{ env.VERSION }}+debug-thingy91x-nrf91.config
182-
cp app/zephyr/zephyr.signed.bin hello.nrfcloud.com-${{ env.VERSION }}+debug-thingy91x-nrf91-update-signed.bin
183-
cp app/zephyr/zephyr.signed.hex hello.nrfcloud.com-${{ env.VERSION }}+debug-thingy91x-nrf91-update-signed.hex
184-
cp app/zephyr/zephyr.elf hello.nrfcloud.com-${{ env.VERSION }}+debug-thingy91x-nrf91.elf
185-
cp dfu_application.zip hello.nrfcloud.com-${{ env.VERSION }}+debug-thingy91x-nrf91-dfu.zip
166+
cp app/zephyr/.config asset-tracker-template-${{ env.VERSION }}-debug-thingy91x-nrf91.config
167+
cp app/zephyr/zephyr.signed.bin asset-tracker-template-${{ env.VERSION }}-debug-thingy91x-nrf91-update-signed.bin
168+
cp app/zephyr/zephyr.signed.hex asset-tracker-template-${{ env.VERSION }}-debug-thingy91x-nrf91-update-signed.hex
169+
cp app/zephyr/zephyr.elf asset-tracker-template-${{ env.VERSION }}-debug-thingy91x-nrf91.elf
170+
cp dfu_application.zip asset-tracker-template-${{ env.VERSION }}-debug-thingy91x-nrf91-dfu.zip
186171
187172
- name: Create partition manager report for nRF91 debug firmware
188173
if: ${{ inputs.build_debug }}
189-
working-directory: thingy91x-oob/app/build
174+
working-directory: thingy91x-att/app/build
190175
run: |
191176
ninja partition_manager_report
192177
ninja partition_manager_report > pmr-nrf91-debug-${{ env.VERSION }}.txt
@@ -195,89 +180,13 @@ jobs:
195180
- name: Upload artifact
196181
if: ${{ inputs.build_debug }}
197182
uses: actions/upload-artifact@v4
198-
id: artifact-upload-oob-debug
199-
with:
200-
name: firmware-oob-debug
201-
if-no-files-found: error
202-
path: |
203-
thingy91x-oob/app/build/hello.nrfcloud.com-*.*
204-
thingy91x-oob/app/build/pmr-nrf91-*.txt
205-
206-
# Connectivity Bridge firmware build
207-
208-
- name: Build nrf53 firmware
209-
working-directory: nrf/applications/connectivity_bridge
210-
run: |
211-
west build -b thingy91x/nrf5340/cpuapp -p --sysbuild -- -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=3 -DCONFIG_BUILD_S1_VARIANT=y
212-
213-
- name: Create partition manager report for nRF53 firmware
214-
working-directory: nrf/applications/connectivity_bridge/build
215-
run: |
216-
ninja partition_manager_report
217-
ninja partition_manager_report > pmr-nrf53-default-${{ env.VERSION }}.txt
218-
sed -i '1d' pmr-nrf53-default-${{ env.VERSION }}.txt
219-
220-
- name: Create nrf53 merged_domains HEX file
221-
run: |
222-
# check that bootloader hex files are present
223-
ls $(pwd)/nrf53-bl-v*-net.hex $(pwd)/nrf53-bl-v*-app.hex
224-
# merge hex files to app, net and merged variants, enforcing the frozen bootloader
225-
python3 zephyr/scripts/build/mergehex.py -o \
226-
$(pwd)/nrf/applications/connectivity_bridge/build/connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-net.hex \
227-
$(pwd)/nrf/applications/connectivity_bridge/build/merged_CPUNET.hex \
228-
$(pwd)/nrf53-bl-v*-net.hex \
229-
--overlap replace
230-
python3 zephyr/scripts/build/mergehex.py -o \
231-
$(pwd)/nrf/applications/connectivity_bridge/build/connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-app.hex \
232-
$(pwd)/nrf/applications/connectivity_bridge/build/merged.hex \
233-
$(pwd)/nrf53-bl-v*-app.hex \
234-
--overlap replace
235-
python3 zephyr/scripts/build/mergehex.py -o \
236-
$(pwd)/nrf/applications/connectivity_bridge/build/connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-merged.hex \
237-
$(pwd)/nrf/applications/connectivity_bridge/build/connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-app.hex \
238-
$(pwd)/nrf/applications/connectivity_bridge/build/connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-net.hex
239-
240-
- name: Copy nrf53 DFU file
241-
run: |
242-
cp $(pwd)/nrf/applications/connectivity_bridge/build/dfu_application.zip \
243-
$(pwd)/nrf/applications/connectivity_bridge/build/connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-dfu.zip
244-
cp nrf53-bl-*.hex $(pwd)/nrf/applications/connectivity_bridge/build/
245-
246-
- name: Upload artifact
247-
uses: actions/upload-artifact@v4
248-
id: artifact-upload-connectivity-bridge
249-
with:
250-
name: firmware-connectivity-bridge
251-
if-no-files-found: error
252-
path: |
253-
nrf/applications/connectivity_bridge/build/connectivity-bridge-*.*
254-
nrf/applications/connectivity_bridge/build/nrf53-bl-*.hex
255-
nrf/applications/connectivity_bridge/build/pmr-nrf53-*.txt
256-
257-
# Bootloader update build
258-
259-
- name: Build BL Update
260-
if: ${{ inputs.build_bl_update }}
261-
working-directory: thingy91x-oob
262-
run: |
263-
west twister -T . --test app/app.build.bootloader_update -v -p thingy91x/nrf9151/ns --inline-logs
264-
cp twister-out/thingy91x_nrf9151_ns/app/app.build.bootloader_update/dfu_mcuboot.zip \
265-
hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91-bootloader.zip
266-
rm -rf twister-out
267-
west build -b thingy91x/nrf5340/cpuapp -p --sysbuild -d ../nrf/applications/connectivity_bridge/build-bl-update ../nrf/applications/connectivity_bridge -- -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=4 -DCONFIG_BUILD_S1_VARIANT=y
268-
cp ../nrf/applications/connectivity_bridge/build-bl-update/dfu_mcuboot.zip \
269-
connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-bootloader.zip
270-
271-
- name: Upload artifact
272-
if: ${{ inputs.build_bl_update }}
273-
uses: actions/upload-artifact@v4
274-
id: artifact-upload-bl-update
183+
id: artifact-upload-att-debug
275184
with:
276-
name: firmware-bl-update
185+
name: firmware-att-debug
277186
if-no-files-found: error
278187
path: |
279-
thingy91x-oob/hello.nrfcloud.com-*.*
280-
thingy91x-oob/connectivity-bridge-*.*
188+
thingy91x-att/app/build/asset-tracker-template-*.*
189+
thingy91x-att/app/build/pmr-nrf91-*.txt
281190
282191
- name: Print run-id and fw version
283192
run: |

.github/workflows/compliance.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
- name: Checkout the code
2020
uses: actions/checkout@v4
2121
with:
22-
path: thingy91x-oob
22+
path: thingy91x-att
2323
ref: ${{ github.event.pull_request.head.sha }}
2424
fetch-depth: 0
2525

2626
- name: Initialize
27-
working-directory: thingy91x-oob
27+
working-directory: thingy91x-att
2828
run: |
2929
west init -l .
3030
west config manifest.group-filter +bsec
@@ -38,21 +38,21 @@ jobs:
3838
shell: bash
3939
env:
4040
BASE_REF: ${{ github.base_ref }}
41-
working-directory: thingy91x-oob
41+
working-directory: thingy91x-att
4242
run: |
4343
export ZEPHYR_BASE="../zephyr"
4444
$ZEPHYR_BASE/scripts/ci/check_compliance.py -m Codeowners -m Devicetree -m Gitlint -m Identity -m Nits -m pylint -m checkpatch -m KconfigBasic -c origin/${BASE_REF}..
4545
4646
- name: check-warns
47-
working-directory: thingy91x-oob
47+
working-directory: thingy91x-att
4848
shell: bash
4949
run: |
5050
if [[ ! -s "compliance.xml" ]]; then
5151
exit 1;
5252
fi
5353
5454
- name: check-warns
55-
working-directory: thingy91x-oob
55+
working-directory: thingy91x-att
5656
shell: bash
5757
run: |
5858
for file in Nits.txt checkpatch.txt Identity.txt Gitlint.txt pylint.txt Devicetree.txt Kconfig.txt KconfigBasic.txt Codeowners.txt; do

0 commit comments

Comments
 (0)