Fix NCS version in build (#3)

Author: noahp

.github/workflows/build.yml

@@ -30,12 +30,12 @@ jobs:
 
     - name: Apply patches
       run: |
-        git -C /opt/ncs/v3.1.1/nrf apply < patches/peripheral_mds.patch
+        git -C /opt/ncs/${MEMFAULT_NCS_VERSION}/nrf apply < patches/peripheral_mds.patch
 
     - name: Build firmware for ${{ matrix.board }}
       run: |
         . /opt/toolchain-env.sh
-        cd /opt/ncs/v3.1.1
+        cd /opt/ncs/${MEMFAULT_NCS_VERSION}
         west build --sysbuild --pristine=always --board ${{ matrix.board }} nrf/samples/bluetooth/peripheral_mds -- -DCONFIG_MEMFAULT_NCS_PROJECT_KEY=\"dummy\"
 
     - name: Create sanitized board name
@@ -50,25 +50,25 @@ jobs:
       with:
         name: firmware-v0.0.1-${{ steps.board_name.outputs.sanitized }}-${{ github.sha }}
         path: |
-          /opt/ncs/v3.1.1/build/dfu_application.zip_manifest.json
-          /opt/ncs/v3.1.1/build/dfu_application.zip
-          /opt/ncs/v3.1.1/build/merged.hex
-          /opt/ncs/v3.1.1/build/peripheral_mds/zephyr/zephyr.elf
+          /opt/ncs/*/build/dfu_application.zip_manifest.json
+          /opt/ncs/*/build/dfu_application.zip
+          /opt/ncs/*/build/merged.hex
+          /opt/ncs/*/build/peripheral_mds/zephyr/zephyr.elf
         retention-days: 30
 
     - name: Rebuild with version=0.0.2
       run: |
         . /opt/toolchain-env.sh
-        cd /opt/ncs/v3.1.1
+        cd /opt/ncs/${MEMFAULT_NCS_VERSION}
         west build --sysbuild --pristine=always --board ${{ matrix.board }} nrf/samples/bluetooth/peripheral_mds -- -DCONFIG_MEMFAULT_NCS_PROJECT_KEY=\"dummy\" -DCONFIG_MEMFAULT_NCS_FW_VERSION=\"0.0.2\"
 
     - name: Upload v0.0.2 build artifacts
       uses: actions/upload-artifact@v4
       with:
         name: firmware-v0.0.2-${{ steps.board_name.outputs.sanitized }}-${{ github.sha }}
         path: |
-          /opt/ncs/v3.1.1/build/dfu_application.zip_manifest.json
-          /opt/ncs/v3.1.1/build/dfu_application.zip
-          /opt/ncs/v3.1.1/build/merged.hex
-          /opt/ncs/v3.1.1/build/peripheral_mds/zephyr/zephyr.elf
+          /opt/ncs/*/build/dfu_application.zip_manifest.json
+          /opt/ncs/*/build/dfu_application.zip
+          /opt/ncs/*/build/merged.hex
+          /opt/ncs/*/build/peripheral_mds/zephyr/zephyr.elf
         retention-days: 30

Dockerfile

@@ -10,8 +10,11 @@ RUN west init -m https://github.com/nrfconnect/sdk-nrf --mr ${NCS_VERSION} /opt/
     west update --narrow -o=--depth=1 && \
     west zephyr-export
 
-RUN rm /opt/.bashrc
+# Save NCS version as an environment variable, for use in the container
+ENV MEMFAULT_NCS_VERSION=${NCS_VERSION}
 
+# Remove the built-in bashrc shim, it tries to install J-Link
+RUN rm /opt/.bashrc
 ENTRYPOINT ["/bin/bash", "-c", "source /opt/toolchain-env.sh && exec \"$@\"", "--"]
 CMD ["/bin/bash"]