make as wrapper to idf.py for consistency

update ci build script to only build esp32-s2 target with freertos
examples

2 files changed, 14 insertions, 42 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 551c7cb92..7edb1fcba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,15 +36,23 @@ jobs:
       
     - name: Install Toolchains
       run: |
+        # ARM & RISC-V GCC from xpack
         npm install --global xpm
         xpm install --global @xpack-dev-tools/arm-none-eabi-gcc@latest
         xpm install --global @xpack-dev-tools/riscv-none-embed-gcc@latest
-        wget http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/8_3_0_0/exports/msp430-gcc-8.3.0.16_linux64.tar.bz2 -O /tmp/msp430-gcc.tar.bz2
-        tar -C $HOME -xaf /tmp/msp430-gcc.tar.bz2
         echo "::add-path::`echo $HOME/opt/xPacks/@xpack-dev-tools/arm-none-eabi-gcc/*/.content/bin`"
         echo "::add-path::`echo $HOME/opt/xPacks/@xpack-dev-tools/riscv-none-embed-gcc/*/.content/bin`"
+
+        # TI MSP430 GCC
+        wget http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/8_3_0_0/exports/msp430-gcc-8.3.0.16_linux64.tar.bz2 -O /tmp/msp430-gcc.tar.bz2
+        tar -C $HOME -xaf /tmp/msp430-gcc.tar.bz2
         echo "::add-path::`echo $HOME/msp430-gcc-*_linux64/bin`"
-      
+
+        # ESP IDF
+        git clone https://github.com/espressif/esp-idf.git $HOME/esp-idf
+        cd $HOME/esp-idf
+        ./install.sh
+
     - name: Checkout TinyUSB
       uses: actions/checkout@v2
     
@@ -54,5 +62,7 @@ jobs:
         git submodule update --init --recursive
     
     - name: Build
-      run: python3 tools/build_all.py ${{ matrix.example }}
+      run: |
+        . $HOME/esp-idf/export.sh
+        python3 tools/build_all.py ${{ matrix.example }}
 
diff --git a/.github/workflows/esp32s2.yml b/.github/workflows/esp32s2.yml
deleted file mode 100644
index a3f30c8f8..000000000
--- a/.github/workflows/esp32s2.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Build ESP32-S2
-
-on: [pull_request, push, repository_dispatch]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        example: ['cdc_msc_freertos']
-        
-    steps:
-    - name: Setup Python
-      uses: actions/setup-python@v1
-      
-    - name: Install ESP-IDF
-      run: |
-        git clone https://github.com/espressif/esp-idf.git $HOME/esp-idf
-        cd $HOME/esp-idf
-        ./install.sh 
-        #echo "::add-path::`echo $HOME/msp430-gcc-*_linux64/bin`"
-      
-    - name: Checkout TinyUSB
-      uses: actions/checkout@v2
-    
-#    - name: Checkout Submodules
-#      run: |
-#        git submodule sync --recursive
-#        git submodule update --init --recursive
-    
-    - name: Build
-      run: |
-        . $HOME/esp-idf/export.sh
-        cd examples/device/cdc_msc_freertos
-        idf.py build
-        #python3 tools/build_all.py ${{ matrix.example }}
-