Skip to content

Commit d7f9ef6

Browse files
benlyebenlye
authored
Use devel boards in CI workflow (#709)
1 parent bfc8c2f commit d7f9ef6

File tree

2 files changed

+36
-29
lines changed

2 files changed

+36
-29
lines changed

‎.github/workflows/main.yml‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ jobs:
4040
fail-fast: false
4141
matrix:
4242
board: [
43-
"multi4in1:avr:multiatmega328p:bootloader=none",
44-
"multi4in1:avr:multiatmega328p:bootloader=optiboot",
45-
"multi4in1:avr:multixmega32d4",
46-
"multi4in1:STM32F1:multi5in1t18int",
47-
"multi4in1:STM32F1:multistm32f103cb:debug_option=none",
48-
"multi4in1:STM32F1:multistm32f103cb:debug_option=native",
49-
"multi4in1:STM32F1:multistm32f103cb:debug_option=ftdi",
50-
"multi4in1:STM32F1:multistm32f103c8:debug_option=none"
43+
"multi4in1-devel:avr:multiatmega328p:bootloader=none",
44+
"multi4in1-devel:avr:multiatmega328p:bootloader=optiboot",
45+
"multi4in1-devel:avr:multixmega32d4",
46+
"multi4in1-devel:STM32F1:multi5in1t18int",
47+
"multi4in1-devel:STM32F1:multistm32f103cb:debug_option=none",
48+
"multi4in1-devel:STM32F1:multistm32f103cb:debug_option=native",
49+
"multi4in1-devel:STM32F1:multistm32f103cb:debug_option=ftdi",
50+
"multi4in1-devel:STM32F1:multistm32f103c8:debug_option=none"
5151
]
5252

5353
# Set the environment variables
@@ -67,15 +67,22 @@ jobs:
6767
echo "Event action: ${{ github.event.action }}"
6868
echo "Tag name: ${{ github.event.release.tag_name }}"
6969
70-
arduino-cli config init --additional-urls https://raw.githubusercontent.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/master/package_multi_4in1_board_index.json
70+
arduino-cli config init --additional-urls https://raw.githubusercontent.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/master/package_multi_4in1_board_index.json,https://raw.githubusercontent.com/pascallanger/DIY-Multiprotocol-TX-Module-Boards/devel/source/package_multi_4in1_board_devel_index.json
7171
arduino-cli core update-index
7272
73-
if [[ "$BOARD" =~ "multi4in1:avr:" ]]; then
73+
if [[ "$BOARD" =~ ":avr:" ]]; then
7474
arduino-cli core install arduino:avr;
75+
fi
76+
77+
if [[ "$BOARD" =~ "multi4in1-devel:avr" ]]; then
78+
arduino-cli core install multi4in1-devel:avr
79+
elif [[ "$BOARD" =~ "multi4in1:avr" ]]; then
7580
arduino-cli core install multi4in1:avr
7681
fi
7782
78-
if [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
83+
if [[ "$BOARD" =~ "multi4in1-devel:STM32F1:" ]]; then
84+
arduino-cli core install multi4in1-devel:STM32F1
85+
elif [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
7986
arduino-cli core install multi4in1:STM32F1
8087
fi
8188
@@ -109,18 +116,18 @@ jobs:
109116
echo "ALL_RFMODULES=$(echo $ALL_RFMODULES)" >> $GITHUB_ENV
110117
111118
# Disable CHECK_FOR_BOOTLOADER when not needed
112-
if [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=none" ]]; then
119+
if [[ "$BOARD" =~ ":avr:multiatmega328p:bootloader=none" ]]; then
113120
opt_disable CHECK_FOR_BOOTLOADER;
114121
fi
115122
116123
# Trim the build down for the Atmega328p board
117-
if [[ "$BOARD" =~ "multi4in1:avr:multiatmega328p:" ]]; then
124+
if [[ "$BOARD" =~ ":avr:multiatmega328p:" ]]; then
118125
opt_disable $ALL_PROTOCOLS
119126
opt_enable FRSKYX_CC2500_INO AFHDS2A_A7105_INO MJXQ_NRF24L01_INO DSM_CYRF6936_INO;
120127
fi
121128
122129
# Trim the enabled protocols down for the STM32F103CB board with debugging or the STM32F103C8 board in general
123-
if [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=ftdi" ]] || [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=native" ]] || [[ "$BOARD" =~ "multi4in1:STM32F1:multistm32f103c8" ]]; then
130+
if [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=ftdi" ]] || [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=native" ]] || [[ "$BOARD" =~ ":STM32F1:multistm32f103c8" ]]; then
124131
opt_disable $ALL_PROTOCOLS;
125132
opt_enable FRSKYX_CC2500_INO AFHDS2A_A7105_INO MJXQ_NRF24L01_INO DSM_CYRF6936_INO;
126133
fi
@@ -133,7 +140,7 @@ jobs:
133140
- name: Build default configuration
134141
run: |
135142
# Skip the default build for boards where it's too large now
136-
if [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=none" ]] || [[ "$BOARD" == "multi4in1:STM32F1:multi5in1t18int" ]]; then
143+
if [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=none" ]] || [[ "$BOARD" =~ ":STM32F1:multi5in1t18int" ]]; then
137144
printf "Not testing default build for $BOARD.";
138145
else
139146
source ./buildroot/bin/buildFunctions;

‎buildroot/bin/buildFunctions‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ getMultiVersion() {
99
}
1010

1111
getAllRFModules() {
12-
if [[ "$BOARD" =~ "multi4in1:avr:multixmega32d4" ]]; then
12+
if [[ "$BOARD" =~ ":avr:multixmega32d4" ]]; then
1313
ALL_RFMODULES=$(echo CYRF6936_INSTALLED);
14-
elif [[ "$BOARD" =~ "multi4in1:avr:multiatmega328p:" ]]; then
14+
elif [[ "$BOARD" =~ ":avr:multiatmega328p:" ]]; then
1515
ALL_RFMODULES=$(echo A7105_INSTALLED CYRF6936_INSTALLED CC2500_INSTALLED NRF24L01_INSTALLED);
16-
elif [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
16+
elif [[ "$BOARD" =~ ":STM32F1:" ]]; then
1717
ALL_RFMODULES=$(echo A7105_INSTALLED CYRF6936_INSTALLED CC2500_INSTALLED NRF24L01_INSTALLED SX1276_INSTALLED);
1818
fi
1919
}
@@ -26,11 +26,11 @@ getAllProtocols() {
2626
CCNRF_PROTOCOLS=$(sed -n 's/[\/\/]*[[:blank:]]*#define[[:blank:]]*\([[:alnum:]_]*_CCNRF_INO\)\(.*\)/\1/p' Multiprotocol/_Config.h)
2727
SX1276_PROTOCOLS=$(sed -n 's/[\/\/]*[[:blank:]]*#define[[:blank:]]*\([[:alnum:]_]*_SX1276_INO\)\(.*\)/\1/p' Multiprotocol/_Config.h)
2828

29-
if [[ "$BOARD" =~ "multi4in1:avr:multixmega32d4" ]]; then
29+
if [[ "$BOARD" =~ ":avr:multixmega32d4" ]]; then
3030
ALL_PROTOCOLS=$(echo $CYRF6936_PROTOCOLS);
31-
elif [[ "$BOARD" =~ "multi4in1:avr:multiatmega328p:" ]]; then
31+
elif [[ "$BOARD" =~ ":avr:multiatmega328p:" ]]; then
3232
ALL_PROTOCOLS=$(echo $A7105_PROTOCOLS $CC2500_PROTOCOLS $CYRF6936_PROTOCOLS $NRF24L01_PROTOCOLS $CCNRF_PROTOCOLS);
33-
elif [[ "$BOARD" =~ "multi4in1:STM32F1:" ]]; then
33+
elif [[ "$BOARD" =~ ":STM32F1:" ]]; then
3434
ALL_PROTOCOLS=$(echo $A7105_PROTOCOLS $CC2500_PROTOCOLS $CYRF6936_PROTOCOLS $NRF24L01_PROTOCOLS $CCNRF_PROTOCOLS $SX1276_PROTOCOLS);
3535
fi
3636
}
@@ -84,21 +84,21 @@ buildEachRFModule() {
8484
}
8585

8686
buildReleaseFiles(){
87-
if [[ "$BOARD" == "multi4in1:avr:multixmega32d4" ]]; then
87+
if [[ "$BOARD" =~ ":avr:multixmega32d4" ]]; then
8888
build_release_orx;
89-
elif [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=none" ]]; then
89+
elif [[ "$BOARD" =~ ":avr:multiatmega328p:bootloader=none" ]]; then
9090
build_release_avr_noboot;
91-
elif [[ "$BOARD" == "multi4in1:avr:multiatmega328p:bootloader=optiboot" ]]; then
91+
elif [[ "$BOARD" =~ ":avr:multiatmega328p:bootloader=optiboot" ]]; then
9292
build_release_avr_optiboot;
93-
elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=none" ]]; then
93+
elif [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=none" ]]; then
9494
build_release_stm32f1_no_debug;
95-
elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=native" ]]; then
95+
elif [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=native" ]]; then
9696
build_release_stm32f1_native_debug;
97-
elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103cb:debug_option=ftdi" ]]; then
97+
elif [[ "$BOARD" =~ ":STM32F1:multistm32f103cb:debug_option=ftdi" ]]; then
9898
build_release_stm32f1_serial_debug;
99-
elif [[ "$BOARD" == "multi4in1:STM32F1:multi5in1t18int" ]]; then
99+
elif [[ "$BOARD" =~ ":STM32F1:multi5in1t18int" ]]; then
100100
build_release_stm32f1_t18int;
101-
elif [[ "$BOARD" == "multi4in1:STM32F1:multistm32f103c8:debug_option=none" ]]; then
101+
elif [[ "$BOARD" =~ ":STM32F1:multistm32f103c8:debug_option=none" ]]; then
102102
build_release_stm32f1_64k;
103103
else
104104
printf "No release files for this board.";

0 commit comments

Comments
 (0)