Skip to content

Commit

Permalink
Added --nostdin to yaml-merge calls.
Browse files Browse the repository at this point in the history
  • Loading branch information
end2endzone committed Aug 3, 2024
1 parent 8c60c4e commit d77aa3a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ci/linux/install_arduino_cores.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ echo.
echo.

echo Adding arduinocli-core-esp8266.yaml to arduino-cli config...
yaml-merge arduinocli-core-esp8266.yaml '$ARDUINO_CONFIG_PATH' --overwrite='$ARDUINO_CONFIG_PATH'
yaml-merge --nostdin arduinocli-core-esp8266.yaml '$ARDUINO_CONFIG_PATH' --overwrite='$ARDUINO_CONFIG_PATH'
cat "$ARDUINO_CONFIG_PATH"
echo
echo

echo Adding arduinocli-core-esp32.yaml to arduino-cli config...
yaml-merge arduinocli-core-esp32.yaml '$ARDUINO_CONFIG_PATH' --overwrite='$ARDUINO_CONFIG_PATH'
yaml-merge --nostdin arduinocli-core-esp32.yaml '$ARDUINO_CONFIG_PATH' --overwrite='$ARDUINO_CONFIG_PATH'
cat "$ARDUINO_CONFIG_PATH"
echo
echo
Expand Down
4 changes: 2 additions & 2 deletions ci/windows/install_arduino_cores.bat
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ echo.
echo.

echo Adding arduinocli-core-esp8266.yaml to arduino-cli config...
yaml-merge arduinocli-core-esp8266.yaml "%ARDUINO_CONFIG_PATH%" --overwrite="%ARDUINO_CONFIG_PATH%"
yaml-merge --nostdin arduinocli-core-esp8266.yaml "%ARDUINO_CONFIG_PATH%" --overwrite="%ARDUINO_CONFIG_PATH%"
if %errorlevel% neq 0 exit /b %errorlevel%
type "%ARDUINO_CONFIG_PATH%"
echo.
echo.

echo Adding arduinocli-core-esp32.yaml to arduino-cli config...
yaml-merge arduinocli-core-esp32.yaml "%ARDUINO_CONFIG_PATH%" --overwrite="%ARDUINO_CONFIG_PATH%"
yaml-merge --nostdin arduinocli-core-esp32.yaml "%ARDUINO_CONFIG_PATH%" --overwrite="%ARDUINO_CONFIG_PATH%"
if %errorlevel% neq 0 exit /b %errorlevel%
type "%ARDUINO_CONFIG_PATH%"
echo.
Expand Down

0 comments on commit d77aa3a

Please sign in to comment.