Rework the sketch builder to match the IDE (#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
espressif · Aug 27, 2019 · 7a57439 · 7a57439
1 parent fd089d8
commit 7a57439
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 118 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,17 +18,17 @@ jobs:
     - name: Pull submodules
       run: git submodule update --init --recursive
     - name: Run CMake Check
-      run: ./tools/check_cmakelists.sh
+      run: ./tools/ci/check-cmakelists.sh
 
     - name: Install Arduino IDE
       env:
         #ESP32_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 0 18
+      run: ./tools/ci/test-arduino-ide.sh 0 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -43,11 +43,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 1 18
+      run: ./tools/ci/test-arduino-ide.sh 1 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -62,11 +62,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 2 18
+      run: ./tools/ci/test-arduino-ide.sh 2 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -81,11 +81,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 3 18
+      run: ./tools/ci/test-arduino-ide.sh 3 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -100,11 +100,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 4 18
+      run: ./tools/ci/test-arduino-ide.sh 4 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -119,11 +119,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 5 18
+      run: ./tools/ci/test-arduino-ide.sh 5 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -138,11 +138,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 6 18
+      run: ./tools/ci/test-arduino-ide.sh 6 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -157,11 +157,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 7 18
+      run: ./tools/ci/test-arduino-ide.sh 7 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -176,11 +176,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 8 18
+      run: ./tools/ci/test-arduino-ide.sh 8 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -195,11 +195,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 9 18
+      run: ./tools/ci/test-arduino-ide.sh 9 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -214,11 +214,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 10 18
+      run: ./tools/ci/test-arduino-ide.sh 10 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -233,11 +233,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 11 18
+      run: ./tools/ci/test-arduino-ide.sh 11 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -252,11 +252,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 12 18
+      run: ./tools/ci/test-arduino-ide.sh 12 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -271,11 +271,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 13 18
+      run: ./tools/ci/test-arduino-ide.sh 13 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -290,11 +290,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 14 18
+      run: ./tools/ci/test-arduino-ide.sh 14 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -309,11 +309,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 15 18
+      run: ./tools/ci/test-arduino-ide.sh 15 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -328,11 +328,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 16 18
+      run: ./tools/ci/test-arduino-ide.sh 16 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -347,11 +347,11 @@ jobs:
     - name: Install Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-arduino-ide.sh
+      run: ./tools/ci/prep-arduino-ide.sh
     - name: Test Arduino IDE
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/test-arduino-ide.sh 17 18
+      run: ./tools/ci/test-arduino-ide.sh 17 18
     - name: Sketch Sizes
       run: cat size.log
 
@@ -371,6 +371,6 @@ jobs:
     - name: Install PlatformIO
       env:
         TRAVIS_BUILD_DIR: ${{ github.workspace }}
-      run: ./tools/prep-platformio.sh
+      run: ./tools/ci/prep-platformio.sh
     - name: Test PlatformIO
-      run: ./tools/test-platformio.sh
+      run: ./tools/ci/test-platformio.sh
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,6 @@ os:
 git:
   depth: false
 
-# new script start
 before_install:
   - git submodule update --init --recursive
 
@@ -24,60 +23,43 @@ jobs:
     - name: "Build Arduino 0"
       if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
       stage: build
-      script: $TRAVIS_BUILD_DIR/tools/build-tests.sh 0 4
+      script: $TRAVIS_BUILD_DIR/tools/ci/build-tests.sh 0 4
 
     - name: "Build Arduino 1"
       if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
       stage: build
-      script: $TRAVIS_BUILD_DIR/tools/build-tests.sh 1 4
+      script: $TRAVIS_BUILD_DIR/tools/ci/build-tests.sh 1 4
 
     - name: "Build Arduino 2"
       if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
       stage: build
-      script: $TRAVIS_BUILD_DIR/tools/build-tests.sh 2 4
+      script: $TRAVIS_BUILD_DIR/tools/ci/build-tests.sh 2 4
 
     - name: "Build Arduino 3"
       if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
       stage: build
-      script: $TRAVIS_BUILD_DIR/tools/build-tests.sh 3 4
+      script: $TRAVIS_BUILD_DIR/tools/ci/build-tests.sh 3 4
 
     - name: "Build PlatformIO"
       if: tag IS blank AND (type = pull_request OR (type = push AND branch = master))
       stage: build
-      script: $TRAVIS_BUILD_DIR/tools/build-tests.sh 4 4
+      script: $TRAVIS_BUILD_DIR/tools/ci/build-tests.sh 4 4
 
     - name: "Package & Deploy"
       if: tag IS present
       stage: deploy
       env:
         - 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="
         - REMOTE_URL=https://github.com/$TRAVIS_REPO_SLUG/releases/download/$TRAVIS_TAG
-      script: bash $TRAVIS_BUILD_DIR/tools/build-release.sh -a$ESP32_GITHUB_TOKEN
+      script: bash $TRAVIS_BUILD_DIR/tools/ci/build-release.sh -a$ESP32_GITHUB_TOKEN
       before_deploy: git submodule update --init
       deploy:
       - provider: script
         skip_cleanup: true
-        script: bash $TRAVIS_BUILD_DIR/tools/deploy.sh -t$TRAVIS_TAG -a$ESP32_GITHUB_TOKEN -s$TRAVIS_REPO_SLUG -drelease
+        script: bash $TRAVIS_BUILD_DIR/tools/ci/deploy-release.sh -t$TRAVIS_TAG -a$ESP32_GITHUB_TOKEN -s$TRAVIS_REPO_SLUG -drelease
         on:
           tags: true
 
-# old script start
-# env:
-#     global:
-#         - 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="
-#         - REMOTE_URL=https://github.com/$TRAVIS_REPO_SLUG/releases/download/$TRAVIS_TAG
-
-# script:
-#   - bash $TRAVIS_BUILD_DIR/tools/build.sh
-
-# deploy:
-#   provider: script
-#   skip_cleanup: true
-#   script: bash $TRAVIS_BUILD_DIR/tools/deploy.sh -t$TRAVIS_TAG -a$ESP32_GITHUB_TOKEN -s$TRAVIS_REPO_SLUG -drelease
-
-#   on:
-#     tags: true
-
 notifications:
   email:
     on_success: change

diff --git a/tools/build.sh b/tools/build.sh
diff --git a/tools/build-release.sh → tools/ci/build-release.sh b/tools/build-release.sh → tools/ci/build-release.sh