Split nrf into separate set of jobs and install nrfutil 7

Author: tannewt

.github/actions/deps/external/action.yml

@@ -37,7 +37,7 @@ runs:
 
     # arm
     - name: Get arm toolchain
-      if: inputs.platform == 'aarch' || inputs.platform == 'arm'
+      if: inputs.platform == 'aarch' || inputs.platform == 'arm' || inputs.platform == 'nrf'
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         release: '10-2020-q4'
@@ -65,6 +65,22 @@ runs:
         echo >> $GITHUB_PATH "$PATH"
       shell: bash
 
+    # nrf
+    - name: Get nrfutil 7+
+      if: inputs.platform == 'nrf'
+      run: |
+        wget https://developer.nordicsemi.com/.pc-tools/nrfutil/x64-linux/nrfutil
+        chmod +x nrfutil
+        ./nrfutil install nrf5sdk-tools
+        mkdir -p $HOME/.local/bin
+        mv nrfutil $HOME/.local/bin
+        echo "$HOME/.local/bin" >> $GITHUB_PATH
+      shell: bash
+    - name: Print nrfutil version
+      if: inputs.platform == 'nrf'
+      run: nrfutil version
+      shell: bash
+
     # riscv
     - name: Get riscv toolchain
       if: inputs.platform == 'riscv'

.github/workflows/build.yml

@@ -25,6 +25,7 @@ jobs:
       boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
       boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
       boards-esp: ${{ steps.set-matrix.outputs.boards-esp }}
+      boards-nrf: ${{ steps.set-matrix.outputs.boards-nrf }}
       boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
       boards-rpi: ${{ steps.set-matrix.outputs.boards-rpi }}
       cp-version: ${{ steps.set-up-submodules.outputs.version }}
@@ -248,6 +249,14 @@ jobs:
       boards: ${{ needs.scheduler.outputs.boards-esp }}
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
+  nrf:
+    needs: [scheduler, mpy-cross, tests]
+    if: ${{ needs.scheduler.outputs.boards-nrf != '[]' }}
+    uses: ./.github/workflows/build-boards.yml
+    with:
+      platform: nrf
+      boards: ${{ needs.scheduler.outputs.boards-nrf }}
+      cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
   riscv:
     needs: [scheduler, mpy-cross, tests]

ports/nrf/Makefile

@@ -206,7 +206,7 @@ UF2_FAMILY_ID_nrf52840 = 0xADA52840
 UF2_FAMILY_ID_nrf52833 = 0x621E937A
 
 
-all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2 $(BUILD)/firmware.combined.hex $(BUILD)/firmware.espruino.zip
+all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2 $(BUILD)/firmware.combined.hex
 
 $(BUILD)/firmware.elf: $(OBJ) $(GENERATED_LD_FILE)
 	$(STEPECHO) "LINK $@"
@@ -275,7 +275,8 @@ endif
 #####################
 .phony: dfu-gen dfu-flash
 
-NRFUTIL = adafruit-nrfutil
+NRFUTIL = nrfutil
+ADAFRUIT_NRFUTIL = adafruit-nrfutil
 
 ifeq ($(MCU_SUB_VARIANT),nrf52840)
 	DFU_TOUCH = --touch 1200
@@ -293,17 +294,17 @@ __check_defined = \
 ## Flash with DFU serial
 dfu-flash: $(BUILD)/dfu-package.zip
 	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyUSB0)
-	$(NRFUTIL) --verbose dfu serial --package $^ -p $(SERIAL) -b 115200 --singlebank $(DFU_TOUCH)
+	$(ADAFRUIT_NRFUTIL) --verbose dfu serial --package $^ -p $(SERIAL) -b 115200 --singlebank $(DFU_TOUCH)
 
 ## Create DFU package file
 dfu-gen: $(BUILD)/dfu-package.zip
 
 $(BUILD)/dfu-package.zip: $(BUILD)/firmware.hex
-	$(NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $^ $(BUILD)/dfu-package.zip
+	$(ADAFRUIT_NRFUTIL) dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application $^ $(BUILD)/dfu-package.zip
 
 # Espruino DFU
 $(BUILD)/firmware.espruino.zip: $(BUILD)/firmware.hex
-	$(NRFUTIL) pkg generate $(BUILD)/firmware.espruino.zip --application $^ --application-version 0xff --hw-version 52 --sd-req 0xa9,0xae,0xb6 --key-file espruino_dfu_private_key.pem
+	$(Q)$(NRFUTIL) pkg generate $(BUILD)/firmware.espruino.zip --application $^ --application-version 0xff --hw-version 52 --sd-req 0xa9,0xae,0xb6 --key-file espruino_dfu_private_key.pem
 
 espruino-dfu-gen: $(BUILD)/firmware.espruino.zip
 

tools/build_release_files.py

@@ -66,13 +66,20 @@
         if clean_build:
             build_dir += "-{language}".format(language=language)
 
+        extensions = [
+            extension.strip()
+            for extension in board_settings["CIRCUITPY_BUILD_EXTENSIONS"].split(",")
+        ]
+
+        artifacts = [os.path.join(build_dir, "firmware." + extension) for extension in extensions]
         make_result = subprocess.run(
-            "make -C ../ports/{port} TRANSLATION={language} BOARD={board} BUILD={build} -j {cores}".format(
+            "make -C ../ports/{port} TRANSLATION={language} BOARD={board} BUILD={build} -j {cores} {artifacts}".format(
                 port=board_info["port"],
                 language=language,
                 board=board,
                 build=build_dir,
                 cores=cores,
+                artifacts=" ".join(artifacts),
             ),
             shell=True,
             stdout=subprocess.PIPE,
@@ -86,10 +93,6 @@
             success = "\033[31mfailed\033[0m"
 
         other_output = ""
-        extensions = [
-            extension.strip()
-            for extension in board_settings["CIRCUITPY_BUILD_EXTENSIONS"].split(",")
-        ]
 
         for extension in extensions:
             temp_filename = "../ports/{port}/{build}/firmware.{extension}".format(

tools/ci_set_matrix.py

@@ -42,14 +42,14 @@
     all_ports_all_boards,
 )
 
-PORT_TO_ARCH = {
+PORT_TO_BUILD_JOB = {
     "atmel-samd": "arm",
     "broadcom": "aarch",
     "cxd56": "arm",
     "espressif": "esp",
     "litex": "riscv",
     "mimxrt10xx": "arm",
-    "nrf": "arm",
+    "nrf": "nrf",
     "raspberrypi": "rpi",
     "stm": "arm",
 }
@@ -203,14 +203,14 @@ def get_settings(board):
             boards_to_build = all_board_ids
             break
 
-    # Split boards by architecture.
-    arch_to_boards = {"aarch": [], "arm": [], "esp": [], "riscv": [], "rpi": []}
+    # Split boards by build job.
+    build_job_to_boards = {"aarch": [], "arm": [], "esp": [], "nrf": [], "riscv": [], "rpi": []}
 
     # Append previously failed boards
-    for arch in arch_to_boards:
-        arch_to_job = f"build-{arch}"
-        if arch_to_job in last_failed_jobs:
-            for board in last_failed_jobs[arch_to_job]:
+    for build_job in build_job_to_boards:
+        job_name = f"build-{build_job}"
+        if job_name in last_failed_jobs:
+            for board in last_failed_jobs[job_name]:
                 if not board in boards_to_build:
                     boards_to_build.append(board)
 
@@ -225,12 +225,12 @@ def get_settings(board):
         # if this happens it's not in `board_to_port`.
         if not port:
             continue
-        arch_to_boards[PORT_TO_ARCH[port]].append(board)
+        build_job_to_boards[PORT_TO_BUILD_JOB[port]].append(board)
         print(" ", board)
 
     # Set the step outputs for each architecture
-    for arch in arch_to_boards:
-        set_output(f"boards-{arch}", json.dumps(arch_to_boards[arch]))
+    for build_job in build_job_to_boards:
+        set_output(f"boards-{build_job}", json.dumps(build_job_to_boards[arch]))
 
 
 def set_docs_to_build(build_doc: bool):