Skip to content

Commit 59487d0

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
committed
fix: Windows runner build skip and exit on error
1 parent 8d1a845 commit 59487d0

File tree

6 files changed

+51
-37
lines changed

6 files changed

+51
-37
lines changed

Diff for: ‎.github/scripts/on-push.sh

+6-12
Original file line numberDiff line numberDiff line change
@@ -73,22 +73,16 @@ if [ "$BUILD_PIO" -eq 0 ]; then
7373

7474
SKETCHES_ESP32="\
7575
$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino\
76-
$ARDUINO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino\
76+
$ARDUINO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino\
7777
$ARDUINO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino\
7878
$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino\
7979
"
8080

81-
SKETCHES_ESP32XX="\
82-
$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino\
83-
$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino\
84-
$ARDUINO_ESP32_PATH/libraries/Insights/examples/MinimalDiagnostics/MinimalDiagnostics.ino\
85-
"
86-
8781
build "esp32s3" $FQBN_ESP32S3 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
88-
build "esp32s2" $FQBN_ESP32S2 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32XX
89-
build "esp32c3" $FQBN_ESP32C3 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32XX
90-
build "esp32c6" $FQBN_ESP32C6 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32XX
91-
build "esp32h2" $FQBN_ESP32H2 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32XX
82+
build "esp32s2" $FQBN_ESP32S2 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
83+
build "esp32c3" $FQBN_ESP32C3 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
84+
build "esp32c6" $FQBN_ESP32C6 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
85+
build "esp32h2" $FQBN_ESP32H2 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
9286
build "esp32" $FQBN_ESP32 $CHUNK_INDEX $CHUNKS_CNT $SKETCHES_ESP32
9387
else
9488
source ${SCRIPTS_DIR}/install-platformio-esp32.sh
@@ -98,7 +92,7 @@ else
9892
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
9993
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino" && \
10094
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino" && \
101-
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/BLE_server/BLE_server.ino" && \
95+
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/BLE/examples/Server/Server.ino" && \
10296
build_pio_sketch "$BOARD" "$OPTIONS" "$PLATFORMIO_ESP32_PATH/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino"
10397

10498
# Basic sanity testing for other series

Diff for: ‎.github/scripts/sketch_utils.sh

+16
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
126126
# of configuration built in case of a multiconfiguration test.
127127

128128
sketchname=$(basename $sketchdir)
129+
130+
if [[ -n $target ]] && [[ -f "$sketchdir/.skip.$target" ]]; then
131+
echo "Skipping $sketchname for target $target"
132+
exit 0
133+
fi
129134

130135
ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp"
131136
if [ -n "$ARDUINO_BUILD_DIR" ]; then
@@ -159,6 +164,12 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
159164
--build-cache-path "$ARDUINO_CACHE_DIR" \
160165
--build-path "$build_dir" \
161166
$xtra_opts "${sketchdir}"
167+
168+
exit_status=$?
169+
if [ $exit_status -ne 0 ]; then
170+
echo ""ERROR: Compilation failed with error code $exit_status""
171+
exit $exit_status
172+
fi
162173
elif [ -f "$ide_path/arduino-builder" ]; then
163174
echo "Building $sketchname with arduino-builder and FQBN=$currfqbn"
164175
echo "Build path = $build_dir"
@@ -173,6 +184,11 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
173184
-build-path "$build_dir" \
174185
$xtra_opts "${sketchdir}/${sketchname}.ino"
175186

187+
exit_status=$?
188+
if [ $exit_status -ne 0 ]; then
189+
echo ""ERROR: Compilation failed with error code $exit_status""
190+
exit $exit_status
191+
fi
176192
# $ide_path/arduino-builder -compile -logger=human -core-api-version=10810 \
177193
# -fqbn=\"$currfqbn\" \
178194
# -warnings="all" \

Diff for: ‎cores/esp32/Esp.cpp

+10-9
Original file line numberDiff line numberDiff line change
@@ -225,30 +225,31 @@ String EspClass::getSketchMD5()
225225
const esp_partition_t *running = esp_ota_get_running_partition();
226226
if (!running) {
227227
log_e("Partition could not be found");
228-
229228
return String();
230229
}
230+
231231
const size_t bufSize = SPI_FLASH_SEC_SIZE;
232-
std::unique_ptr<uint8_t[]> buf(new uint8_t[bufSize]);
233-
uint32_t offset = 0;
234-
if(!buf.get()) {
232+
uint8_t *pb = (uint8_t *)malloc(bufSize);
233+
if(!pb) {
235234
log_e("Not enough memory to allocate buffer");
236-
237235
return String();
238236
}
237+
uint32_t offset = 0;
238+
239239
MD5Builder md5;
240240
md5.begin();
241-
while( lengthLeft > 0) {
241+
while(lengthLeft > 0) {
242242
size_t readBytes = (lengthLeft < bufSize) ? lengthLeft : bufSize;
243-
if (!ESP.flashRead(running->address + offset, reinterpret_cast<uint32_t*>(buf.get()), (readBytes + 3) & ~3)) {
243+
if (!ESP.flashRead(running->address + offset, (uint32_t *)pb, (readBytes + 3) & ~3)) {
244+
free(pb);
244245
log_e("Could not read buffer from flash");
245-
246246
return String();
247247
}
248-
md5.add(buf.get(), readBytes);
248+
md5.add(pb, readBytes);
249249
lengthLeft -= readBytes;
250250
offset += readBytes;
251251
}
252+
free(pb);
252253
md5.calculate();
253254
result = md5.toString();
254255
return result;

Diff for: ‎libraries/BLE/src/BLEAdvertising.cpp

+8-5
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,12 @@ void BLEAdvertising::start() {
231231
int numServices = m_serviceUUIDs.size();
232232
if (numServices > 0) {
233233
m_advData.service_uuid_len = 16 * numServices;
234-
m_advData.p_service_uuid = new uint8_t[m_advData.service_uuid_len];
234+
m_advData.p_service_uuid = (uint8_t *)malloc(m_advData.service_uuid_len);
235+
if(!m_advData.p_service_uuid) {
236+
log_e(">> start failed: out of memory");
237+
return;
238+
}
239+
235240
uint8_t* p = m_advData.p_service_uuid;
236241
for (int i = 0; i < numServices; i++) {
237242
log_d("- advertising service: %s", m_serviceUUIDs[i].toString().c_str());
@@ -276,10 +281,8 @@ void BLEAdvertising::start() {
276281

277282
// If we had services to advertise then we previously allocated some storage for them.
278283
// Here we release that storage.
279-
if (m_advData.service_uuid_len > 0) {
280-
delete[] m_advData.p_service_uuid;
281-
m_advData.p_service_uuid = nullptr;
282-
}
284+
free(m_advData.p_service_uuid); //TODO change this variable to local scope?
285+
m_advData.p_service_uuid = nullptr;
283286

284287
// Start advertising.
285288
errRc = ::esp_ble_gap_start_advertising(&m_advParams);

Diff for: ‎libraries/WebServer/src/WebServer.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,26 @@ bool WebServer::authenticate(const char * username, const char * password){
135135
authReq = authReq.substring(6);
136136
authReq.trim();
137137
char toencodeLen = strlen(username)+strlen(password)+1;
138-
char *toencode = new char[toencodeLen + 1];
138+
char *toencode = (char *)malloc[toencodeLen + 1];
139139
if(toencode == NULL){
140140
authReq = "";
141141
return false;
142142
}
143-
char *encoded = new char[base64_encode_expected_len(toencodeLen)+1];
143+
char *encoded = (char *)malloc(base64_encode_expected_len(toencodeLen)+1);
144144
if(encoded == NULL){
145145
authReq = "";
146-
delete[] toencode;
146+
free(toencode);
147147
return false;
148148
}
149149
sprintf(toencode, "%s:%s", username, password);
150150
if(base64_encode_chars(toencode, toencodeLen, encoded) > 0 && authReq.equalsConstantTime(encoded)) {
151151
authReq = "";
152-
delete[] toencode;
153-
delete[] encoded;
152+
free(toencode);
153+
free(encoded);
154154
return true;
155155
}
156-
delete[] toencode;
157-
delete[] encoded;
156+
free(toencode);
157+
free(encoded);;
158158
} else if(authReq.startsWith(F("Digest"))) {
159159
authReq = authReq.substring(7);
160160
log_v("%s", authReq.c_str());

Diff for: ‎libraries/WiFi/src/WiFiUdp.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ uint8_t WiFiUDP::begin(IPAddress address, uint16_t port){
4444

4545
server_port = port;
4646

47-
tx_buffer = new char[1460];
47+
tx_buffer = (char *)malloc(1460);
4848
if(!tx_buffer){
4949
log_e("could not create tx buffer: %d", errno);
5050
return 0;
5151
}
52+
tx_buffer_len = 0;
5253

5354
if ((udp_server=socket(AF_INET, SOCK_DGRAM, 0)) == -1){
5455
log_e("could not create socket: %d", errno);
@@ -100,7 +101,7 @@ uint8_t WiFiUDP::beginMulticast(IPAddress a, uint16_t p){
100101

101102
void WiFiUDP::stop(){
102103
if(tx_buffer){
103-
delete[] tx_buffer;
104+
free(tx_buffer);
104105
tx_buffer = NULL;
105106
}
106107
tx_buffer_len = 0;
@@ -136,13 +137,12 @@ int WiFiUDP::beginPacket(){
136137

137138
// allocate tx_buffer if is necessary
138139
if(!tx_buffer){
139-
tx_buffer = new char[1460];
140+
tx_buffer = (char *)malloc(1460);
140141
if(!tx_buffer){
141142
log_e("could not create tx buffer: %d", errno);
142143
return 0;
143144
}
144145
}
145-
146146
tx_buffer_len = 0;
147147

148148
// check whereas socket is already open

0 commit comments

Comments
 (0)