build_util.yml support esp32

hathach · May 10, 2024 · e9086b0 · e9086b0
1 parent bba993b
commit e9086b0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 71 deletions.
diff --git a/.github/actions/setup_toolchain/action.yml b/.github/actions/setup_toolchain/action.yml
@@ -19,7 +19,7 @@ runs:
 
     - name: Pull ESP-IDF docker
       if: inputs.toolchain == 'esp-idf'
-      run: docker pull espressif/idf:latest
+      run: docker pull espressif/idf:${{ inputs.toolchain_url }}
       shell: bash
 
     - name: Download Toolchain

diff --git a/.github/workflows/build_esp.yml b/.github/workflows/build_esp.yml
@@ -36,21 +36,23 @@ jobs:
         # ESP32-S3
         - 'espressif_s3_devkitm'
     steps:
-    - name: Setup Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.x'
-
-    - name: Checkout TinyUSB
-      uses: actions/checkout@v4
-
-    - name: Setup Toolchain
-      uses: ./.github/actions/setup_toolchain
+    - name: Build
+      uses: ./.github/workflows/build_util.yml
       with:
-        toolchain: 'esp-idf'
+          build-system: 'cmake'
+          toolchain: 'esp-idf'
+          toolchain_url: 'v5.1.1'
+          build-args: '[${{ matrix.board }}]'
 
-    - name: Build
-      run: docker run --rm -v $PWD:/project -w /project espressif/idf:v5.1.1 python3 tools/build.py -b ${{ matrix.board }}
+#    - name: Setup Toolchain
+#      uses: ./.github/actions/setup_toolchain
+#      with:
+#        toolchain: 'esp-idf'
+#        # toolchain_url: is used as idf version
+#        toolchain_url: 'v5.1.1'
+#
+#    - name: Build
+#      run: docker run --rm -v $PWD:/project -w /project espressif/idf:v5.1.1 python3 tools/build.py -b ${{ matrix.board }}
 
     - name: Upload Artifacts for Hardware Testing
       if: matrix.board == 'espressif_s3_devkitm' && github.repository_owner == 'hathach'

diff --git a/.github/workflows/build_util.yml b/.github/workflows/build_util.yml
@@ -52,10 +52,13 @@ jobs:
 
       - name: Get Dependencies
         run: |
-          sudo apt install -y ninja-build
+          if [[ "${{ inputs.os }}" == "ubuntu-latest" ]]; then
+            apt install -y ninja-build
+          fi
           python3 tools/get_deps.py ${{ matrix.arg }}
 
       - name: Build
+        if: inputs.toolchain != 'esp-idf'
         run: |
           OPTION=""
           if [[ "${{ inputs.toolchain }}" == *"clang"* ]]; then
@@ -65,3 +68,8 @@ jobs:
           python tools/build.py -s ${{ inputs.build-system }} $OPTION ${{ matrix.arg }}
         env:
           PICO_SDK_PATH: ${{ github.workspace }}/pico-sdk
+
+      - name: Build using ESP-IDF docker
+        if: inputs.toolchain == 'esp-idf'
+        run: |
+          docker run --rm -v $PWD:/project -w /project espressif/idf:${{ inputs.toolchain_url }} python3 tools/build.py ${{ matrix.arg }}
diff --git a/.github/workflows/build_win_mac.yml b/.github/workflows/build_win_mac.yml