jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing regression bug caused by DELIMITER change in the supported devices script

Browse source 
+ Adding ability to manually run "Supported Devices" job
+ Changing `Delimiter` from UTF8 to ASCII character
This commit is contained in:
Chris 2022-08-31 14:15:14 +10:00 • committed by Adam Honse
parent ec6a19eef9
commit 1f6580ebc5
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -51,6 +51,9 @@ before_script:
rules: rules:
- if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"' - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"'
when: on_success when: on_success
- if: $CI_PIPELINE_SOURCE == "push"
when: manual
allow_failure: true
#-----------------------------------------------------------------------# #-----------------------------------------------------------------------#
# Linux (AppImage) 32-bit Build Target # # Linux (AppImage) 32-bit Build Target #

4
scripts/build-supported-devices-md.sh
View file

@ -23,7 +23,7 @@ MAIN_FILE='Supported Devices.md'
#make -j$(nproc) #make -j$(nproc)
## The HID list is produced from each "REGISTER_DETECTOR" macro replacement. ## The HID list is produced from each "REGISTER_DETECTOR" macro replacement.
DELIMITER='‖' DELIMITER=$'\x01'
## | callback_function | VID | PID | Name | ## | callback_function | VID | PID | Name |
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 }') 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 }')
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 }') 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
do do
case $type in case $type in
USB) USB)
IFS="${DELIMITER}" read null vid pid device_name null <<<"$device" IFS="${DELIMITER}" read null vid pid device_name null <<< "${device}"
#Remove leading hex signifier from $vid and $pid #Remove leading hex signifier from $vid and $pid
vid=${vid/0x/} vid=${vid/0x/}
pid=${pid/0x/} pid=${pid/0x/}