Skip to content

Commit 10444af

Browse files
DematteisGiacomoDematteisGiacomo
committed
workflows: fix memfault elf upload
Memfault elf upload was not working correctly. Signed-off-by: Giacomo Dematteis <giacomo.dematteis@nordicsemi.no>
1 parent b25bf90 commit 10444af

5 files changed

Lines changed: 37 additions & 35 deletions

File tree

‎.github/workflows/attach_release_assets.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
secrets: inherit
1616
with:
1717
build_debug: true
18-
memfault_sw_type: "asset-tracker-template"
18+
memfault_fw_type: "asset-tracker-template"
1919

2020
attach-assets:
2121
runs-on: ubuntu-24.04

‎.github/workflows/build.yml‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ on:
99
default: false
1010
workflow_call:
1111
inputs:
12-
memfault_sw_type:
12+
memfault_fw_type:
1313
type: string
1414
required: false
15-
default: "asset-tracker-template-ci"
15+
default: "asset-tracker-template-dev"
1616
build_debug:
1717
type: boolean
1818
required: false
@@ -84,12 +84,18 @@ jobs:
8484
python3 scripts/app_version.py ${GITHUB_REF_NAME} > app/VERSION
8585
cat app/VERSION
8686
87-
- name: Set MEMFAULT_SW_TYPE from inputs or use default
87+
- name: Set MEMFAULT_FW_TYPE and MEMFAULT_FW_VERSION_PREFIX
8888
run: |
8989
if [ -z "${{ inputs.memfault_sw_type }}" ]; then
90-
echo "MEMFAULT_SW_TYPE=asset-tracker-template-ci" >> $GITHUB_ENV
90+
echo "MEMFAULT_FW_TYPE=asset-tracker-template-dev" >> $GITHUB_ENV
9191
else
92-
echo "MEMFAULT_SW_TYPE=${{ inputs.memfault_sw_type }}" >> $GITHUB_ENV
92+
echo "MEMFAULT_FW_TYPE=${{ inputs.memfault_sw_type }}" >> $GITHUB_ENV
93+
fi
94+
95+
if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "true" ]]; then
96+
echo "MEMFAULT_FW_VERSION_PREFIX=${{ github.ref_name }}" >> $GITHUB_ENV
97+
else
98+
echo "MEMFAULT_FW_VERSION_PREFIX=0.0.0-dev" >> $GITHUB_ENV
9399
fi
94100
95101
# Asset Tracker Template firmware build
@@ -99,9 +105,9 @@ jobs:
99105
mkdir -p artifacts
100106
cp overlay-memfault.conf overlay-memfault-att.conf
101107
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 }}-thingy91x\" >> overlay-memfault-att.conf
108+
echo CONFIG_MEMFAULT_NCS_FW_TYPE=\"${{ env.MEMFAULT_FW_TYPE }}\" >> overlay-memfault-att.conf
109+
echo CONFIG_MEMFAULT_NCS_FW_VERSION_AUTO=y >> overlay-memfault-att.conf
110+
echo CONFIG_MEMFAULT_NCS_FW_VERSION_PREFIX=\"${{ env.MEMFAULT_FW_VERSION_PREFIX }}+\" >> overlay-memfault-att.conf
105111
west build -b thingy91x/nrf9151/ns -d build -p --sysbuild -- -DEXTRA_CONF_FILE="overlay-memfault-att.conf"
106112
cp build/merged.hex artifacts/asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91.hex
107113
cp build/app/zephyr/.config artifacts/asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91.config
@@ -120,9 +126,9 @@ jobs:
120126
mkdir -p artifacts
121127
cp overlay-memfault.conf overlay-memfault-att.conf
122128
echo "CONFIG_MEMFAULT_NCS_PROJECT_KEY=\"${{ secrets.MEMFAULT_PROJECT_KEY }}\"" >> overlay-memfault-att.conf
123-
echo CONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y >> overlay-memfault-att.conf
124-
echo CONFIG_MEMFAULT_NCS_FW_VERSION=\"${{ env.VERSION }}\" >> overlay-memfault-att.conf
125-
echo CONFIG_MEMFAULT_NCS_FW_TYPE=\"${{ env.MEMFAULT_SW_TYPE }}-nrf9151dk\" >> overlay-memfault-att.conf
129+
echo CONFIG_MEMFAULT_NCS_FW_TYPE=\"${{ env.MEMFAULT_FW_TYPE }}\" >> overlay-memfault-att.conf
130+
echo CONFIG_MEMFAULT_NCS_FW_VERSION_AUTO=y >> overlay-memfault-att.conf
131+
echo CONFIG_MEMFAULT_NCS_FW_VERSION_PREFIX=\"${{ env.MEMFAULT_FW_VERSION_PREFIX }}+\" >> overlay-memfault-att.conf
126132
west build -b nrf9151dk/nrf9151/ns -d build -p --sysbuild -- -DEXTRA_CONF_FILE="overlay-memfault-att.conf"
127133
cp build/merged.hex artifacts/asset-tracker-template-${{ env.VERSION }}-nrf9151dk-nrf91.hex
128134
cp build/app/zephyr/.config artifacts/asset-tracker-template-${{ env.VERSION }}-nrf9151dk-nrf91.config
@@ -151,9 +157,9 @@ jobs:
151157
run: |
152158
cp overlay-memfault.conf overlay-memfault-debug.conf
153159
echo "CONFIG_MEMFAULT_NCS_PROJECT_KEY=\"${{ secrets.MEMFAULT_PROJECT_KEY }}\"" >> overlay-memfault-debug.conf
154-
echo CONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y >> overlay-memfault-debug.conf
155-
echo CONFIG_MEMFAULT_NCS_FW_VERSION=\"${{ env.VERSION }}-debug\" >> overlay-memfault-debug.conf
156-
echo CONFIG_MEMFAULT_NCS_FW_TYPE=\"${{ env.MEMFAULT_SW_TYPE }}-thingy91x\" >> overlay-memfault-debug.conf
160+
echo CONFIG_MEMFAULT_NCS_FW_TYPE=\"${{ env.MEMFAULT_FW_TYPE }}\" >> overlay-memfault-debug.conf
161+
echo CONFIG_MEMFAULT_NCS_FW_VERSION_AUTO=y >> overlay-memfault-debug.conf
162+
echo CONFIG_MEMFAULT_NCS_FW_VERSION_PREFIX=\"${{ env.MEMFAULT_FW_VERSION_PREFIX }}-debug+\" >> overlay-memfault-debug.conf
157163
west build -p -b thingy91x/nrf9151/ns -p --sysbuild -- -DEXTRA_CONF_FILE="overlay-memfault-debug.conf;overlay-etb.conf"
158164
159165
- name: Rename debug artifacts
@@ -175,7 +181,7 @@ jobs:
175181
ninja partition_manager_report > pmr-nrf91-debug-${{ env.VERSION }}.txt
176182
sed -i '1d' pmr-nrf91-debug-${{ env.VERSION }}.txt
177183
178-
- name: Upload artifact
184+
- name: Upload debug artifact
179185
if: ${{ inputs.build_debug }}
180186
uses: actions/upload-artifact@v4
181187
id: artifact-upload-att-debug

‎.github/workflows/publish-symbol-files-to-memfault.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,15 @@ jobs:
4040
--org ${{ vars.MEMFAULT_ORGANIZATION_SLUG }} \
4141
--project ${{ vars.MEMFAULT_PROJECT_SLUG }} \
4242
upload-mcu-symbols \
43-
--software-type asset-tracker-template-thingy91x \
44-
--software-version ${{ inputs.version }} \
43+
--check-uploaded \
4544
asset-tracker-template-${{ inputs.version }}-thingy91x-nrf91.elf
4645
4746
memfault \
4847
--org-token ${{ secrets.MEMFAULT_ORGANIZATION_TOKEN }} \
4948
--org ${{ vars.MEMFAULT_ORGANIZATION_SLUG }} \
5049
--project ${{ vars.MEMFAULT_PROJECT_SLUG }} \
5150
upload-mcu-symbols \
52-
--software-type asset-tracker-template-nrf9151dk \
53-
--software-version ${{ inputs.version }} \
51+
--check-uploaded \
5452
asset-tracker-template-${{ inputs.version }}-nrf9151dk-nrf91.elf
5553
5654
- name: Publish debug symbol files
@@ -61,6 +59,5 @@ jobs:
6159
--org ${{ vars.MEMFAULT_ORGANIZATION_SLUG }} \
6260
--project ${{ vars.MEMFAULT_PROJECT_SLUG }} \
6361
upload-mcu-symbols \
64-
--software-type asset-tracker-template-thingy91x \
65-
--software-version ${{ inputs.version }}-debug \
62+
--check-uploaded \
6663
asset-tracker-template-${{ inputs.version }}-debug-thingy91x-nrf91.elf

‎.github/workflows/target-test.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ jobs:
104104
--org ${{ vars.MEMFAULT_ORGANIZATION_SLUG }} \
105105
--project ${{ vars.MEMFAULT_PROJECT_SLUG }} \
106106
upload-mcu-symbols \
107-
--software-type asset-tracker-template-ci-${{ matrix.device }} \
108-
--software-version ${{ inputs.artifact_fw_version }} \
107+
--check-uploaded \
109108
asset-tracker-template-${{ inputs.artifact_fw_version }}-${{ vars.DUT_DEVICE_TYPE }}-nrf91.elf
110109
111110
- name: Target Tests
@@ -146,14 +145,14 @@ jobs:
146145
MEMFAULT_PROJECT_SLUG: ${{ vars.MEMFAULT_PROJECT_SLUG }}
147146
APP_BUNDLEID: ${{ env.APP_BUNDLEID }}
148147

149-
# - name: Commit and Push Badge File to gh-pages Branch
150-
# if: ${{ matrix.device }} == ppk_thingy91x
151-
# continue-on-error: true
152-
# working-directory: asset-tracker-template
153-
# env:
154-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
155-
# run: ./tests/on_target/scripts/commit_badge.sh
156-
#
148+
- name: Commit and Push Badge File to gh-pages Branch
149+
if: ${{ matrix.device }} == ppk_thingy91x
150+
continue-on-error: true
151+
working-directory: asset-tracker-template
152+
env:
153+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
154+
run: ./tests/on_target/scripts/commit_badge.sh
155+
157156
- name: Results
158157
if: always()
159158
uses: pmeier/pytest-results-action@v0.7.1

‎tests/on_target/scripts/commit_badge.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ CSV_FILE_DEST=docs/power_measurements.csv
1515
# Check if files exist
1616
if [ ! -f $BADGE_FILE ]; then
1717
echo "Badge file not found: $BADGE_FILE"
18-
exit 1
18+
exit 0
1919
fi
2020
if [ ! -f $HTML_FILE ]; then
2121
echo "HTML file not found: $HTML_FILE"
22-
exit 1
22+
exit 0
2323
fi
2424
if [ ! -f $CSV_FILE ]; then
2525
echo "CSV file not found: $CSV_FILE"
26-
exit 1
26+
exit 0
2727
fi
2828

2929
# Configure Git

0 commit comments

Comments
 (0)