Links2004/arduinoWebSockets
1
0
Fork 1
mirror of https://github.com/Links2004/arduinoWebSockets.git synced 2025-07-21 10:52:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE_VERSION --> CLI_VERSION

Browse Source
This commit is contained in:
Links2004
2024-01-05 15:00:16 +01:00
parent da7efc789e
commit 92480b8987
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/main.yml vendored
View File

@ -55,9 +55,9 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
IDE_VERSION: [0.35.0] CLI_VERSION: [0.35.0]
env: env:
IDE_VERSION: ${{ matrix.IDE_VERSION }} CLI_VERSION: ${{ matrix.CLI_VERSION }}
ARDUINO_DIRECTORIES_DATA: /home/runner/arduino_ide ARDUINO_DIRECTORIES_DATA: /home/runner/arduino_ide
steps: steps:
@ -75,13 +75,13 @@ jobs:
path: | path: |
/home/runner/arduino_ide /home/runner/arduino_ide
/home/runner/Arduino /home/runner/Arduino
key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ matrix.IDE_VERSION }}-cli key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ matrix.CLI_VERSION }}-cli
- name: download IDE - name: download IDE
if: steps.cache_all.outputs.cache-hit != 'true' if: steps.cache_all.outputs.cache-hit != 'true'
run: | run: |
wget https://github.com/arduino/arduino-cli/releases/download/v$IDE_VERSION/arduino-cli$IDE_VERSION_Linux_64bit.tar.gz -q wget https://github.com/arduino/arduino-cli/releases/download/v${CLI_VERSION}/arduino-cli${CLI_VERSION}_Linux_64bit.tar.gz -q
tar xf arduino-cli_$IDE_VERSION_Linux_64bit.tar.gz tar xf arduino-cli_${CLI_VERSION}_Linux_64bit.tar.gz
mkdir -p $ARDUINO_DIRECTORIES_DATA mkdir -p $ARDUINO_DIRECTORIES_DATA
mv arduino-cli $ARDUINO_DIRECTORIES_DATA/ mv arduino-cli $ARDUINO_DIRECTORIES_DATA/
@ -110,7 +110,7 @@ jobs:
env: env:
CPU: ${{ matrix.cpu }} CPU: ${{ matrix.cpu }}
BOARD: ${{ matrix.board }} BOARD: ${{ matrix.board }}
IDE_VERSION: ${{ matrix.ideversion }} CLI_VERSION: ${{ matrix.cliversion }}
SKETCH: ${{ matrix.sketch }} SKETCH: ${{ matrix.sketch }}
ARDUINO_DIRECTORIES_DATA: /home/runner/arduino_ide ARDUINO_DIRECTORIES_DATA: /home/runner/arduino_ide
@ -134,7 +134,7 @@ jobs:
path: | path: |
/home/runner/arduino_ide /home/runner/arduino_ide
/home/runner/Arduino /home/runner/Arduino
key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ matrix.ideversion }}-cli key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ matrix.cliversion }}-cli
- name: install python serial - name: install python serial
if: matrix.cpu == 'esp32' if: matrix.cpu == 'esp32'

4
travis/common.sh
View File

@ -88,7 +88,7 @@ function get_sketches_json_matrix()
local arduino=$1 local arduino=$1
local srcpath=$2 local srcpath=$2
local platform=$3 local platform=$3
local ideversion=$4 local cliversion=$4
local board=$5 local board=$5
local sketches=($(find $srcpath -name *.ino)) local sketches=($(find $srcpath -name *.ino))
for sketch in "${sketches[@]}" ; do for sketch in "${sketches[@]}" ; do
@ -97,7 +97,7 @@ function get_sketches_json_matrix()
if [[ -f "$sketchdir/.$platform.skip" ]]; then if [[ -f "$sketchdir/.$platform.skip" ]]; then
continue continue
fi fi
echo -en "{\"name\":\"$sketchname\",\"board\":\"$board\",\"ideversion\":\"$ideversion\",\"cpu\":\"$platform\",\"sketch\":\"$sketch\"}" echo -en "{\"name\":\"$sketchname\",\"board\":\"$board\",\"cliversion\":\"$cliversion\",\"cpu\":\"$platform\",\"sketch\":\"$sketch\"}"
if [[ $sketch != ${sketches[-1]} ]] ; then if [[ $sketch != ${sketches[-1]} ]] ; then
echo -en "," echo -en ","
fi fi