fix win build

hathach · May 10, 2024 · 57320c9 · 57320c9
1 parent aa16b8d
commit 57320c9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build_util.yml b/.github/workflows/build_util.yml
@@ -50,9 +50,16 @@ jobs:
           ref: develop
           path: pico-sdk
 
-      - name: Install ninja-build
+      - name: Linux specific
         if: inputs.os == 'ubuntu-latest'
-        run: sudo apt install -y ninja-build
+        run: |
+          sudo apt install -y ninja-build
+          BUILD_OPTION=""
+          if [[ "${{ inputs.toolchain }}" == *"clang"* ]]; then
+            BUILD_OPTION="--toolchain clang"
+          fi
+          echo "BUILD_OPTION=$BUILD_OPTION"
+          echo "BUILD_OPTION=$BUILD_OPTION" >> $GITHUB_ENV
 
       - name: Get Dependencies
         run: |
@@ -61,12 +68,7 @@ jobs:
       - name: Build
         if: inputs.toolchain != 'esp-idf'
         run: |
-          OPTION=""
-          if [[ "${{ inputs.toolchain }}" == *"clang"* ]]; then
-            OPTION="--toolchain clang"
-          fi
-          echo "OPTION=$OPTION"
-          python tools/build.py -s ${{ inputs.build-system }} $OPTION ${{ matrix.arg }}
+          python tools/build.py -s ${{ inputs.build-system }} $BUILD_OPTION ${{ matrix.arg }}
         env:
           PICO_SDK_PATH: ${{ github.workspace }}/pico-sdk
 

diff --git a/tools/build.py b/tools/build.py
@@ -184,8 +184,6 @@ def main():
                     total_result[1] += rsum[1]
                     total_result[2] += rsum[2]
 
-
-
     total_time = time.monotonic() - total_time
     print(build_separator)
     print(f"Build Summary: {total_result[0]} {SUCCEEDED}, {total_result[1]} {FAILED} and took {total_time:.2f}s")