Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7a57439

Browse filesBrowse files
me-no-devme-no-dev
authored
Rework the sketch builder to match the IDE (espressif#3146)
* Rework the sketch builder to match the IDE * Link the board to the home folder * Rename files for clarity * move ci files to own subfolder * Update Github CI to use the new script locations
1 parent fd089d8 commit 7a57439
Copy full SHA for 7a57439
Expand file treeCollapse file tree

12 files changed

+108
-118
lines changed

‎.github/workflows/main.yml

Copy file name to clipboardExpand all lines: .github/workflows/main.yml
+39-39Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ jobs:
1818
- name: Pull submodules
1919
run: git submodule update --init --recursive
2020
- name: Run CMake Check
21-
run: ./tools/check_cmakelists.sh
21+
run: ./tools/ci/check-cmakelists.sh
2222

2323
- name: Install Arduino IDE
2424
env:
2525
#ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2626
TRAVIS_BUILD_DIR: ${{ github.workspace }}
27-
run: ./tools/prep-arduino-ide.sh
27+
run: ./tools/ci/prep-arduino-ide.sh
2828
- name: Test Arduino IDE
2929
env:
3030
TRAVIS_BUILD_DIR: ${{ github.workspace }}
31-
run: ./tools/test-arduino-ide.sh 0 18
31+
run: ./tools/ci/test-arduino-ide.sh 0 18
3232
- name: Sketch Sizes
3333
run: cat size.log
3434

@@ -43,11 +43,11 @@ jobs:
4343
- name: Install Arduino IDE
4444
env:
4545
TRAVIS_BUILD_DIR: ${{ github.workspace }}
46-
run: ./tools/prep-arduino-ide.sh
46+
run: ./tools/ci/prep-arduino-ide.sh
4747
- name: Test Arduino IDE
4848
env:
4949
TRAVIS_BUILD_DIR: ${{ github.workspace }}
50-
run: ./tools/test-arduino-ide.sh 1 18
50+
run: ./tools/ci/test-arduino-ide.sh 1 18
5151
- name: Sketch Sizes
5252
run: cat size.log
5353

@@ -62,11 +62,11 @@ jobs:
6262
- name: Install Arduino IDE
6363
env:
6464
TRAVIS_BUILD_DIR: ${{ github.workspace }}
65-
run: ./tools/prep-arduino-ide.sh
65+
run: ./tools/ci/prep-arduino-ide.sh
6666
- name: Test Arduino IDE
6767
env:
6868
TRAVIS_BUILD_DIR: ${{ github.workspace }}
69-
run: ./tools/test-arduino-ide.sh 2 18
69+
run: ./tools/ci/test-arduino-ide.sh 2 18
7070
- name: Sketch Sizes
7171
run: cat size.log
7272

@@ -81,11 +81,11 @@ jobs:
8181
- name: Install Arduino IDE
8282
env:
8383
TRAVIS_BUILD_DIR: ${{ github.workspace }}
84-
run: ./tools/prep-arduino-ide.sh
84+
run: ./tools/ci/prep-arduino-ide.sh
8585
- name: Test Arduino IDE
8686
env:
8787
TRAVIS_BUILD_DIR: ${{ github.workspace }}
88-
run: ./tools/test-arduino-ide.sh 3 18
88+
run: ./tools/ci/test-arduino-ide.sh 3 18
8989
- name: Sketch Sizes
9090
run: cat size.log
9191

@@ -100,11 +100,11 @@ jobs:
100100
- name: Install Arduino IDE
101101
env:
102102
TRAVIS_BUILD_DIR: ${{ github.workspace }}
103-
run: ./tools/prep-arduino-ide.sh
103+
run: ./tools/ci/prep-arduino-ide.sh
104104
- name: Test Arduino IDE
105105
env:
106106
TRAVIS_BUILD_DIR: ${{ github.workspace }}
107-
run: ./tools/test-arduino-ide.sh 4 18
107+
run: ./tools/ci/test-arduino-ide.sh 4 18
108108
- name: Sketch Sizes
109109
run: cat size.log
110110

@@ -119,11 +119,11 @@ jobs:
119119
- name: Install Arduino IDE
120120
env:
121121
TRAVIS_BUILD_DIR: ${{ github.workspace }}
122-
run: ./tools/prep-arduino-ide.sh
122+
run: ./tools/ci/prep-arduino-ide.sh
123123
- name: Test Arduino IDE
124124
env:
125125
TRAVIS_BUILD_DIR: ${{ github.workspace }}
126-
run: ./tools/test-arduino-ide.sh 5 18
126+
run: ./tools/ci/test-arduino-ide.sh 5 18
127127
- name: Sketch Sizes
128128
run: cat size.log
129129

@@ -138,11 +138,11 @@ jobs:
138138
- name: Install Arduino IDE
139139
env:
140140
TRAVIS_BUILD_DIR: ${{ github.workspace }}
141-
run: ./tools/prep-arduino-ide.sh
141+
run: ./tools/ci/prep-arduino-ide.sh
142142
- name: Test Arduino IDE
143143
env:
144144
TRAVIS_BUILD_DIR: ${{ github.workspace }}
145-
run: ./tools/test-arduino-ide.sh 6 18
145+
run: ./tools/ci/test-arduino-ide.sh 6 18
146146
- name: Sketch Sizes
147147
run: cat size.log
148148

@@ -157,11 +157,11 @@ jobs:
157157
- name: Install Arduino IDE
158158
env:
159159
TRAVIS_BUILD_DIR: ${{ github.workspace }}
160-
run: ./tools/prep-arduino-ide.sh
160+
run: ./tools/ci/prep-arduino-ide.sh
161161
- name: Test Arduino IDE
162162
env:
163163
TRAVIS_BUILD_DIR: ${{ github.workspace }}
164-
run: ./tools/test-arduino-ide.sh 7 18
164+
run: ./tools/ci/test-arduino-ide.sh 7 18
165165
- name: Sketch Sizes
166166
run: cat size.log
167167

@@ -176,11 +176,11 @@ jobs:
176176
- name: Install Arduino IDE
177177
env:
178178
TRAVIS_BUILD_DIR: ${{ github.workspace }}
179-
run: ./tools/prep-arduino-ide.sh
179+
run: ./tools/ci/prep-arduino-ide.sh
180180
- name: Test Arduino IDE
181181
env:
182182
TRAVIS_BUILD_DIR: ${{ github.workspace }}
183-
run: ./tools/test-arduino-ide.sh 8 18
183+
run: ./tools/ci/test-arduino-ide.sh 8 18
184184
- name: Sketch Sizes
185185
run: cat size.log
186186

@@ -195,11 +195,11 @@ jobs:
195195
- name: Install Arduino IDE
196196
env:
197197
TRAVIS_BUILD_DIR: ${{ github.workspace }}
198-
run: ./tools/prep-arduino-ide.sh
198+
run: ./tools/ci/prep-arduino-ide.sh
199199
- name: Test Arduino IDE
200200
env:
201201
TRAVIS_BUILD_DIR: ${{ github.workspace }}
202-
run: ./tools/test-arduino-ide.sh 9 18
202+
run: ./tools/ci/test-arduino-ide.sh 9 18
203203
- name: Sketch Sizes
204204
run: cat size.log
205205

@@ -214,11 +214,11 @@ jobs:
214214
- name: Install Arduino IDE
215215
env:
216216
TRAVIS_BUILD_DIR: ${{ github.workspace }}
217-
run: ./tools/prep-arduino-ide.sh
217+
run: ./tools/ci/prep-arduino-ide.sh
218218
- name: Test Arduino IDE
219219
env:
220220
TRAVIS_BUILD_DIR: ${{ github.workspace }}
221-
run: ./tools/test-arduino-ide.sh 10 18
221+
run: ./tools/ci/test-arduino-ide.sh 10 18
222222
- name: Sketch Sizes
223223
run: cat size.log
224224

@@ -233,11 +233,11 @@ jobs:
233233
- name: Install Arduino IDE
234234
env:
235235
TRAVIS_BUILD_DIR: ${{ github.workspace }}
236-
run: ./tools/prep-arduino-ide.sh
236+
run: ./tools/ci/prep-arduino-ide.sh
237237
- name: Test Arduino IDE
238238
env:
239239
TRAVIS_BUILD_DIR: ${{ github.workspace }}
240-
run: ./tools/test-arduino-ide.sh 11 18
240+
run: ./tools/ci/test-arduino-ide.sh 11 18
241241
- name: Sketch Sizes
242242
run: cat size.log
243243

@@ -252,11 +252,11 @@ jobs:
252252
- name: Install Arduino IDE
253253
env:
254254
TRAVIS_BUILD_DIR: ${{ github.workspace }}
255-
run: ./tools/prep-arduino-ide.sh
255+
run: ./tools/ci/prep-arduino-ide.sh
256256
- name: Test Arduino IDE
257257
env:
258258
TRAVIS_BUILD_DIR: ${{ github.workspace }}
259-
run: ./tools/test-arduino-ide.sh 12 18
259+
run: ./tools/ci/test-arduino-ide.sh 12 18
260260
- name: Sketch Sizes
261261
run: cat size.log
262262

@@ -271,11 +271,11 @@ jobs:
271271
- name: Install Arduino IDE
272272
env:
273273
TRAVIS_BUILD_DIR: ${{ github.workspace }}
274-
run: ./tools/prep-arduino-ide.sh
274+
run: ./tools/ci/prep-arduino-ide.sh
275275
- name: Test Arduino IDE
276276
env:
277277
TRAVIS_BUILD_DIR: ${{ github.workspace }}
278-
run: ./tools/test-arduino-ide.sh 13 18
278+
run: ./tools/ci/test-arduino-ide.sh 13 18
279279
- name: Sketch Sizes
280280
run: cat size.log
281281

@@ -290,11 +290,11 @@ jobs:
290290
- name: Install Arduino IDE
291291
env:
292292
TRAVIS_BUILD_DIR: ${{ github.workspace }}
293-
run: ./tools/prep-arduino-ide.sh
293+
run: ./tools/ci/prep-arduino-ide.sh
294294
- name: Test Arduino IDE
295295
env:
296296
TRAVIS_BUILD_DIR: ${{ github.workspace }}
297-
run: ./tools/test-arduino-ide.sh 14 18
297+
run: ./tools/ci/test-arduino-ide.sh 14 18
298298
- name: Sketch Sizes
299299
run: cat size.log
300300

@@ -309,11 +309,11 @@ jobs:
309309
- name: Install Arduino IDE
310310
env:
311311
TRAVIS_BUILD_DIR: ${{ github.workspace }}
312-
run: ./tools/prep-arduino-ide.sh
312+
run: ./tools/ci/prep-arduino-ide.sh
313313
- name: Test Arduino IDE
314314
env:
315315
TRAVIS_BUILD_DIR: ${{ github.workspace }}
316-
run: ./tools/test-arduino-ide.sh 15 18
316+
run: ./tools/ci/test-arduino-ide.sh 15 18
317317
- name: Sketch Sizes
318318
run: cat size.log
319319

@@ -328,11 +328,11 @@ jobs:
328328
- name: Install Arduino IDE
329329
env:
330330
TRAVIS_BUILD_DIR: ${{ github.workspace }}
331-
run: ./tools/prep-arduino-ide.sh
331+
run: ./tools/ci/prep-arduino-ide.sh
332332
- name: Test Arduino IDE
333333
env:
334334
TRAVIS_BUILD_DIR: ${{ github.workspace }}
335-
run: ./tools/test-arduino-ide.sh 16 18
335+
run: ./tools/ci/test-arduino-ide.sh 16 18
336336
- name: Sketch Sizes
337337
run: cat size.log
338338

@@ -347,11 +347,11 @@ jobs:
347347
- name: Install Arduino IDE
348348
env:
349349
TRAVIS_BUILD_DIR: ${{ github.workspace }}
350-
run: ./tools/prep-arduino-ide.sh
350+
run: ./tools/ci/prep-arduino-ide.sh
351351
- name: Test Arduino IDE
352352
env:
353353
TRAVIS_BUILD_DIR: ${{ github.workspace }}
354-
run: ./tools/test-arduino-ide.sh 17 18
354+
run: ./tools/ci/test-arduino-ide.sh 17 18
355355
- name: Sketch Sizes
356356
run: cat size.log
357357

@@ -371,6 +371,6 @@ jobs:
371371
- name: Install PlatformIO
372372
env:
373373
TRAVIS_BUILD_DIR: ${{ github.workspace }}
374-
run: ./tools/prep-platformio.sh
374+
run: ./tools/ci/prep-platformio.sh
375375
- name: Test PlatformIO
376-
run: ./tools/test-platformio.sh
376+
run: ./tools/ci/test-platformio.sh

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+7-25Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ os:
1010
git:
1111
depth: false
1212

13-
# new script start
1413
before_install:
1514
- git submodule update --init --recursive
1615

@@ -24,60 +23,43 @@ jobs:
2423
- name: "Build Arduino 0"
2524
if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
2625
stage: build
27-
script: $TRAVIS_BUILD_DIR/tools/build-tests.sh 0 4
26+
script: $TRAVIS_BUILD_DIR/tools/ci/build-tests.sh 0 4
2827

2928
- name: "Build Arduino 1"
3029
if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
3130
stage: build
32-
script: $TRAVIS_BUILD_DIR/tools/build-tests.sh 1 4
31+
script: $TRAVIS_BUILD_DIR/tools/ci/build-tests.sh 1 4
3332

3433
- name: "Build Arduino 2"
3534
if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
3635
stage: build
37-
script: $TRAVIS_BUILD_DIR/tools/build-tests.sh 2 4
36+
script: $TRAVIS_BUILD_DIR/tools/ci/build-tests.sh 2 4
3837

3938
- name: "Build Arduino 3"
4039
if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
4140
stage: build
42-
script: $TRAVIS_BUILD_DIR/tools/build-tests.sh 3 4
41+
script: $TRAVIS_BUILD_DIR/tools/ci/build-tests.sh 3 4
4342

4443
- name: "Build PlatformIO"
4544
if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
4645
stage: build
47-
script: $TRAVIS_BUILD_DIR/tools/build-tests.sh 4 4
46+
script: $TRAVIS_BUILD_DIR/tools/ci/build-tests.sh 4 4
4847

4948
- name: "Package & Deploy"
5049
if: tag IS present
5150
stage: deploy
5251
env:
5352
- secure: "l/4Dt+KQ/mACtGAHDUsPr66fUte840PZoQ4xpPikqWZI0uARu4l+Ym7+sHinnT6fBqrj8AJeBYGz4nFa8NK4LutZn9mSD40w+sxl0wSV4oHV8rzKe3Cd8+sMG3+o33yWoikMNjSvqa73Q0rm+SgrlInNdZbuAyixL+a2alaWSnGPm4F2xwUGj+S33TOy5P/Xp77CYtCV5S8vzyk/eEdNhoF0GYePJVdfuzCOUjXMyT5OWxORkzzQ7Hnn/Ka/RDfV8Si4HgujLQBrK5q6iPnNBFqBSqilYBepSMn4opnOBpIm0SCgePz7XQEFC83buA7GUcnCnfg38bf+dCwHaODf1d1PmqVRYt2QmfinexXtM4afAtL0iBUDtvrfnXHzwW9w82VeZhpbJSVh9DUQvB0IlsZeCz9J9PUBAi3N+SMX+9l+BomYwRUlPuKY+Ef2JKk9q6mxtUkky5R0daAlVxEhpVdQks1rT+T+NMoDMemxQ3SKEiqAHh6EgHecruszffmZ71uLX9MpERpew0qN+UFiafws+jkTjx+3yF9yut0Hf9sMbeAYzzkGzRqJTUEBJ6B29Cql8M0yRXCNN/8wuuTHhG8esstozga4ZQoIVrq7mEAgup376PTcNfr1+imbbWVQ7lJdYIuDe6OS5V3OX6np11vgK/DbhfyzvQv9Z1zAGnM="
5453
- REMOTE_URL=https://github.com/$TRAVIS_REPO_SLUG/releases/download/$TRAVIS_TAG
55-
script: bash $TRAVIS_BUILD_DIR/tools/build-release.sh -a$ESP32_GITHUB_TOKEN
54+
script: bash $TRAVIS_BUILD_DIR/tools/ci/build-release.sh -a$ESP32_GITHUB_TOKEN
5655
before_deploy: git submodule update --init
5756
deploy:
5857
- provider: script
5958
skip_cleanup: true
60-
script: bash $TRAVIS_BUILD_DIR/tools/deploy.sh -t$TRAVIS_TAG -a$ESP32_GITHUB_TOKEN -s$TRAVIS_REPO_SLUG -drelease
59+
script: bash $TRAVIS_BUILD_DIR/tools/ci/deploy-release.sh -t$TRAVIS_TAG -a$ESP32_GITHUB_TOKEN -s$TRAVIS_REPO_SLUG -drelease
6160
on:
6261
tags: true
6362

64-
# old script start
65-
# env:
66-
# global:
67-
# - secure: "l/4Dt+KQ/mACtGAHDUsPr66fUte840PZoQ4xpPikqWZI0uARu4l+Ym7+sHinnT6fBqrj8AJeBYGz4nFa8NK4LutZn9mSD40w+sxl0wSV4oHV8rzKe3Cd8+sMG3+o33yWoikMNjSvqa73Q0rm+SgrlInNdZbuAyixL+a2alaWSnGPm4F2xwUGj+S33TOy5P/Xp77CYtCV5S8vzyk/eEdNhoF0GYePJVdfuzCOUjXMyT5OWxORkzzQ7Hnn/Ka/RDfV8Si4HgujLQBrK5q6iPnNBFqBSqilYBepSMn4opnOBpIm0SCgePz7XQEFC83buA7GUcnCnfg38bf+dCwHaODf1d1PmqVRYt2QmfinexXtM4afAtL0iBUDtvrfnXHzwW9w82VeZhpbJSVh9DUQvB0IlsZeCz9J9PUBAi3N+SMX+9l+BomYwRUlPuKY+Ef2JKk9q6mxtUkky5R0daAlVxEhpVdQks1rT+T+NMoDMemxQ3SKEiqAHh6EgHecruszffmZ71uLX9MpERpew0qN+UFiafws+jkTjx+3yF9yut0Hf9sMbeAYzzkGzRqJTUEBJ6B29Cql8M0yRXCNN/8wuuTHhG8esstozga4ZQoIVrq7mEAgup376PTcNfr1+imbbWVQ7lJdYIuDe6OS5V3OX6np11vgK/DbhfyzvQv9Z1zAGnM="
68-
# - REMOTE_URL=https://github.com/$TRAVIS_REPO_SLUG/releases/download/$TRAVIS_TAG
69-
70-
# script:
71-
# - bash $TRAVIS_BUILD_DIR/tools/build.sh
72-
73-
# deploy:
74-
# provider: script
75-
# skip_cleanup: true
76-
# script: bash $TRAVIS_BUILD_DIR/tools/deploy.sh -t$TRAVIS_TAG -a$ESP32_GITHUB_TOKEN -s$TRAVIS_REPO_SLUG -drelease
77-
78-
# on:
79-
# tags: true
80-
8163
notifications:
8264
email:
8365
on_success: change

‎tools/build.sh

Copy file name to clipboardExpand all lines: tools/build.sh
-9Lines changed: 0 additions & 9 deletions
This file was deleted.

‎tools/build-release.sh renamed to ‎tools/ci/build-release.sh

Copy file name to clipboard
File renamed without changes.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.