8000 update arduino-cli · jobitjoseph/arduinoWebSockets@11cf068 · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit 11cf068

Browse files
Links2004Links2004
committed
update arduino-cli
1 parent af1b025 commit 11cf068

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

‎.github/workflows/main.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
echo -en "matrix=" >> $GITHUB_OUTPUT
3838
echo -en "[" >> $GITHUB_OUTPUT
3939
40-
get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp8266_pico esp8266 0.35.0 esp8266:esp8266:generic:xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,ResetMethod=nodemcu,CrystalFreq=26,FlashFreq=80,FlashMode=qio,eesz=4M2M,led=2,sdk=nonosdk_190703,ip=lm2f,dbg=Serial1,lvl=SSL,wipe=none,baud=115200 >> $GITHUB_OUTPUT
40+
get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp8266_pico esp8266 0.35.3 esp8266:esp8266:generic:xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,ResetMethod=nodemcu,CrystalFreq=26,FlashFreq=80,FlashMode=qio,eesz=4M2M,led=2,sdk=nonosdk_190703,ip=lm2f,dbg=Serial1,lvl=SSL,wipe=none,baud=115200 >> $GITHUB_OUTPUT
4141
echo -en "," >> $GITHUB_OUTPUT
4242
43-
get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp8266_pico esp8266 0.35.0 esp8266:esp8266:generic:xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,ResetMethod=nodemcu,CrystalFreq=26,FlashFreq=80,FlashMode=qio,eesz=4M2M,led=2,sdk=nonosdk_190703,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=115200 >> $GITHUB_OUTPUT
43+
get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp8266_pico esp8266 0.35.3 esp8266:esp8266:generic:xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,ResetMethod=nodemcu,CrystalFreq=26,FlashFreq=80,FlashMode=qio,eesz=4M2M,led=2,sdk=nonosdk_190703,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=115200 >> $GITHUB_OUTPUT
4444
echo -en "," >> $GITHUB_OUTPUT
4545
46-
get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp32 esp32 0.35.0 esp32:esp32:esp32:FlashFreq=80 >> $GITHUB_OUTPUT
46+
get_sketches_json_matrix arduino $GITHUB_WORKSPACE/examples/esp32 esp32 0.35.3 esp32:esp32:esp32:FlashFreq=80 >> $GITHUB_OUTPUT
4747
4848
echo -en "]" >> $GITHUB_OUTPUT
4949
echo >> $GITHUB_OUTPUT
@@ -55,18 +55,18 @@ jobs:
5555
strategy:
5656
fail-fast: false
5757
matrix:
58-
CLI_VERSION: [0.35.0]
58+
CLI_VERSION: [0.35.3]
5959
env:
6060
CLI_VERSION: ${{ matrix.CLI_VERSION }}
6161
ARDUINO_DIRECTORIES_DATA: /home/runner/arduino_ide
6262

6363
steps:
6464
- uses: actions/checkout@v2
6565

66-
- name: Get Date
67-
id: get-date
66+
- name: Get hash
67+
id: get-hash
6868
run: |
69-
echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
69+
echo "hash=$(/bin/date -u "+%Y%m%d")-$(md5sum ".github/workflows/main.yml" | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
7070
shell: bash
7171

7272
- uses: actions/cache@v3
@@ -75,7 +75,7 @@ jobs:
7575
path: |
7676
/home/runner/arduino_ide
7777
/home/runner/Arduino
78-
key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ matrix.CLI_VERSION }}-cli
78+
key: ${{ runner.os }}-${{ steps.get-hash.outputs.hash }}-${{ matrix.CLI_VERSION }}-cli
7979

8080
- name: download IDE
8181
if: steps.cache_all.outputs.cache-hit != 'true'
@@ -122,10 +122,10 @@ jobs:
122122
run: |
123123
sudo apt-get install -y libgtk2.0-0
124124
125-
- name: Get Date
126-
id: get-date
125+
- name: Get hash
126+
id: get-hash
127127
run: |
128-
echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
128+
echo "hash=$(/bin/date -u "+%Y%m%d")-$(md5sum ".github/workflows/main.yml" | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT
129129
shell: bash
130130

131131
- uses: actions/cache@v3
@@ -134,7 +134,7 @@ jobs:
134134
path: |
135135
/home/runner/arduino_ide
136136
/home/runner/Arduino
137-
key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ matrix.cliversion }}-cli
137+
key: ${{ runner.os }}-${{ steps.get-hash.outputs.hash }}-${{ matrix.cliversion }}-cli
138138

139139
- name: install python serial
140140
if: matrix.cpu == 'esp32'

‎src/WebSocketsClient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void WebSocketsClient::begin(const char * host, uint16_t port, const char * url,
4949
_fingerprint = SSL_FINGERPRINT_NULL;
5050
_CA_cert = NULL;
5151
#ifdef ESP32
52-
_CA_bundle = NULL;
52+
_CA_bundle = NULL;
5353
#endif
5454
#endif
5555

‎travis/common.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/bash
2-
3-
set -x
2+
set -e
43

54
function build_sketches()
65
{

0 commit comments

Comments
 (0)
0