Skip to content

Commit 1f6580e

Browse files
Chr1sNoCalcProgrammer1
authored andcommitted
Fixing regression bug caused by DELIMITER change in the supported devices script
+ Adding ability to manually run "Supported Devices" job + Changing `Delimiter` from UTF8 to ASCII character
1 parent ec6a19e commit 1f6580e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ before_script:
5151
rules:
5252
- if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
5353
when: on_success
54+
- if: $CI_PIPELINE_SOURCE == "push"
55+
when: manual
56+
allow_failure: true
5457

5558
#-----------------------------------------------------------------------#
5659
# Linux (AppImage) 32-bit Build Target #

scripts/build-supported-devices-md.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ MAIN_FILE='Supported Devices.md'
2323
#make -j$(nproc)
2424

2525
## The HID list is produced from each "REGISTER_DETECTOR" macro replacement.
26-
DELIMITER=''
26+
DELIMITER=$'\x01'
2727
## | callback_function | VID | PID | Name |
2828
HID_LIST=$(grep -hR -e "static\ HIDDeviceDetector" . | cut -d '(' -f 2- | awk -F , -v delim="${DELIMITER}" '{ print $2 ":"delim $3 delim $4 delim $1 delim }')
2929
I2C_LIST=$(grep -hR -e "static\ I2CPCIDeviceDetector" . | cut -d '(' -f 2- | awk -F , -v delim="${DELIMITER}" '{ print $2 ":"delim $3 delim $4 delim $5 delim $6 delim $1 delim }')
@@ -233,7 +233,7 @@ do
233233
do
234234
case $type in
235235
USB)
236-
IFS="${DELIMITER}" read null vid pid device_name null <<<"$device"
236+
IFS="${DELIMITER}" read null vid pid device_name null <<< "${device}"
237237
#Remove leading hex signifier from $vid and $pid
238238
vid=${vid/0x/}
239239
pid=${pid/0x/}

0 commit comments

Comments
 (0)