Removed unnecessary step arduino-cli board install from `install_ar…

…duino_cores.*` scripts. Moved arduinocli-core-esp*.yaml files to /ci directory. There is no need to keep separate copies in /ci/linux and /ci/windows. Git handles the new line character just fine. Now using relative file path for yaml-merge calls.
end2endzone · Aug 4, 2024 · b11b4f5 · b11b4f5
1 parent e79c5f5
commit b11b4f5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 25 deletions.
diff --git a/ci/linux/arduinocli-core-esp32.yaml → ci/arduinocli-core-esp32.yaml b/ci/linux/arduinocli-core-esp32.yaml → ci/arduinocli-core-esp32.yaml
diff --git a/ci/linux/arduinocli-core-esp8266.yaml → ci/arduinocli-core-esp8266.yaml b/ci/linux/arduinocli-core-esp8266.yaml → ci/arduinocli-core-esp8266.yaml
diff --git a/ci/linux/install_arduino_cores.sh b/ci/linux/install_arduino_cores.sh
@@ -18,14 +18,16 @@ cat "$ARDUINO_CONFIG_PATH"
 echo
 echo
 
-echo Adding arduinocli-core-esp8266.yaml to arduino-cli config...
-yaml-merge --nostdin arduinocli-core-esp8266.yaml '$ARDUINO_CONFIG_PATH' --overwrite='$ARDUINO_CONFIG_PATH'
+export YAML_MERGE_FILE="../arduinocli-core-esp8266.yaml"
+echo Adding $YAML_MERGE_FILE to arduino-cli config...
+yaml-merge --nostdin '$YAML_MERGE_FILE' '$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 --nostdin arduinocli-core-esp32.yaml '$ARDUINO_CONFIG_PATH' --overwrite='$ARDUINO_CONFIG_PATH'
+set YAML_MERGE_FILE="../arduinocli-core-esp32.yaml"
+echo Adding $YAML_MERGE_FILE to arduino-cli config...
+yaml-merge --nostdin '$YAML_MERGE_FILE' '$ARDUINO_CONFIG_PATH' --overwrite='$ARDUINO_CONFIG_PATH'
 cat "$ARDUINO_CONFIG_PATH"
 echo
 echo
@@ -35,11 +37,6 @@ arduino-cli core update-index
 echo
 echo
 
-echo arduino board install...
-arduino-cli board install
-echo
-echo
-
 echo Installing "arduino:avr" core...
 arduino-cli core install "arduino:avr"
 echo

diff --git a/ci/windows/arduinocli-core-esp32.yaml b/ci/windows/arduinocli-core-esp32.yaml
diff --git a/ci/windows/arduinocli-core-esp8266.yaml b/ci/windows/arduinocli-core-esp8266.yaml
diff --git a/ci/windows/install_arduino_cores.bat b/ci/windows/install_arduino_cores.bat
@@ -18,15 +18,17 @@ type "%ARDUINO_CONFIG_PATH%"
 echo.
 echo.
 
-echo Adding arduinocli-core-esp8266.yaml to arduino-cli config...
-yaml-merge --nostdin arduinocli-core-esp8266.yaml "%ARDUINO_CONFIG_PATH%" --overwrite="%ARDUINO_CONFIG_PATH%"
+set YAML_MERGE_FILE=..\arduinocli-core-esp8266.yaml
+echo Adding %YAML_MERGE_FILE% to arduino-cli config...
+yaml-merge --nostdin "%YAML_MERGE_FILE%" "%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 --nostdin arduinocli-core-esp32.yaml "%ARDUINO_CONFIG_PATH%" --overwrite="%ARDUINO_CONFIG_PATH%"
+set YAML_MERGE_FILE=..\arduinocli-core-esp32.yaml
+echo Adding %YAML_MERGE_FILE% to arduino-cli config...
+yaml-merge --nostdin "%YAML_MERGE_FILE%" "%ARDUINO_CONFIG_PATH%" --overwrite="%ARDUINO_CONFIG_PATH%"
 if %errorlevel% neq 0 exit /b %errorlevel%
 type "%ARDUINO_CONFIG_PATH%"
 echo.
@@ -38,12 +40,6 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 echo.
 echo.
 
-echo arduino board install...
-arduino-cli board install
-if %errorlevel% neq 0 exit /b %errorlevel%
-echo.
-echo.
-
 echo Installing arduino:avr core...
 REM Use `--skip-post-install` on AppVeyor to skip UAC prompt which is blocking the build.
 arduino-cli core install arduino:avr --skip-post-install