Skip to content

Commit 7216055

Browse files
committed
change ci to matrix build
1 parent eab7e68 commit 7216055

File tree

2 files changed

+44
-11
lines changed

2 files changed

+44
-11
lines changed

.github/workflows/githubci.yml

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,55 @@
11
name: Build
22

33
on:
4-
push:
54
pull_request:
5+
push:
6+
repository_dispatch:
67
release:
7-
types: [published]
8+
types:
9+
- created
810

911
jobs:
1012
build:
1113
runs-on: ubuntu-latest
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
board:
18+
# Adafruit Boards
19+
- 'circuitplayground_nrf52840'
20+
- 'clue_nrf52840'
21+
- 'feather_nrf52832'
22+
- 'feather_nrf52840_express'
23+
- 'feather_nrf52840_sense'
24+
- 'itsybitsy_nrf52840_express'
25+
- 'metro_nrf52840_express'
26+
# Alphabetical order
27+
- 'ADM_B_NRF52840_1'
28+
- 'ae_bl652_bo'
29+
- 'aramcon_badge_2019'
30+
- 'arcade_feather_nrf52840_express'
31+
- 'arduino_nano_33_ble'
32+
- 'bast_ble'
33+
- 'bluemicro_nrf52840'
34+
- 'electronut_labs_papyr'
35+
- 'ikigaisense_vita'
36+
- 'mdk_nrf52840_dongle'
37+
- 'nice_nano'
38+
- 'nrf52840_m2'
39+
- 'ohs2020_badge'
40+
- 'particle_argon'
41+
- 'particle_boron'
42+
- 'particle_xenon'
43+
- 'pca10056'
44+
- 'pca10059'
45+
- 'pca10100'
46+
- 'pitaya_go'
47+
- 'raytac_mdbt50q_rx'
48+
- 'waveshare_nrf52840_eval'
49+
1250
steps:
1351
- name: Setup Python
1452
uses: actions/setup-python@v2
15-
with:
16-
# 3.9 has issue with intelhex https://github.com/python-intelhex/intelhex/issues/45
17-
python-version: '3.8'
1853

1954
- name: Setup Node.js
2055
uses: actions/setup-node@v1
@@ -34,7 +69,7 @@ jobs:
3469
echo `echo $HOME/opt/xPacks/@xpack-dev-tools/arm-none-eabi-gcc/*/.content/bin` >> $GITHUB_PATH
3570
3671
- name: Build
37-
run: python3 tools/build_all.py
72+
run: make BOARD=${{ matrix.board }}
3873

3974
- name: Upload Release Asset
4075
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')

src/usb/uf2/ghostfat.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,8 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
391391
switch ( bl->familyID )
392392
{
393393

394-
case CFG_UF2_BOARD_APP_ID: // board-specific app ... may not be usable on other nrf52 boards
395-
case CFG_UF2_FAMILY_APP_ID: // legacy, or where app uses bootloader configuration to discover pins
394+
case CFG_UF2_BOARD_APP_ID: // board-specific app
395+
case CFG_UF2_FAMILY_APP_ID: // family app
396396
/* Upgrading Application
397397
*
398398
* SoftDevice is considered as part of application and can be (or not) included in uf2.
@@ -430,9 +430,7 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
430430
/* Upgrading Bootloader
431431
*
432432
* - For simplicity, the Bootloader Start Address is fixed for now.
433-
*
434433
* - Since SoftDevice is not part of Bootloader, it MUST NOT be included as part of uf2 file.
435-
*
436434
* - To prevent corruption/disconnection while transferring we don't directly write over Bootloader.
437435
* Instead it is written to highest possible address in Application region. Once everything is received
438436
* and verified, it is safely activated using MBR COPY BL command.
@@ -516,7 +514,7 @@ int write_block (uint32_t block_no, uint8_t *data, WriteState *state)
516514
}
517515
else
518516
{
519-
PRINTF("DOES NOT mismatches our VID/PID\r\n");
517+
PRINTF("DOES NOT match our VID/PID\r\n");
520518
state->aborted = true;
521519
return -1;
522520
}

0 commit comments

Comments
 (0)