change armgcc setup to manual download due to issue with action (#3377)

* change armgcc setup to manual download due to issue with action
* build windows, macos with cmake as well

.github/actions/setup_toolchain/action.yml

@@ -13,12 +13,6 @@ outputs:
 runs:
   using: "composite"
   steps:
-    - name: Install ARM GCC
-      if: inputs.toolchain == 'arm-gcc'
-      uses: carlosperate/arm-none-eabi-gcc-action@v1
-      with:
-        release: '14.2.Rel1'
-
     - name: Pull ESP-IDF docker
       if: inputs.toolchain == 'esp-idf'
       uses: ./.github/actions/setup_toolchain/espressif
@@ -26,9 +20,7 @@ runs:
         toolchain: ${{ inputs.toolchain }}
 
     - name: Get Toolchain URL
-      if: >-
-        inputs.toolchain != 'arm-gcc' &&
-        inputs.toolchain != 'esp-idf'
+      if: inputs.toolchain != 'esp-idf'
       id: set-toolchain-url
       env:
         TOOLCHAIN: ${{ inputs.toolchain }}
@@ -39,9 +31,7 @@ runs:
       shell: bash
 
     - name: Download Toolchain
-      if: >-
-        inputs.toolchain != 'arm-gcc' &&
-        inputs.toolchain != 'esp-idf'
+      if: inputs.toolchain != 'esp-idf'
       uses: ./.github/actions/setup_toolchain/download
       with:
         toolchain: ${{ inputs.toolchain }}

.github/actions/setup_toolchain/download/action.yml

@@ -26,6 +26,7 @@ runs:
         TOOLCHAIN_URL: ${{ inputs.toolchain_url }}
       run: |
         mkdir -p ~/cache/${TOOLCHAIN}
+        FILE_EXT="${TOOLCHAIN_URL##*.}"
 
         if [[ ${TOOLCHAIN} == rx-gcc ]]; then
           wget --progress=dot:giga ${TOOLCHAIN_URL} -O toolchain.run
@@ -34,9 +35,16 @@ runs:
         elif [[ ${TOOLCHAIN} == arm-iar ]]; then
           wget --progress=dot:giga https://netstorage.iar.com/FileStore/STANDARD/001/003/926/iar-lmsc-tools_1.8_amd64.deb -O ~/cache/${TOOLCHAIN}/iar-lmsc-tools.deb
           wget --progress=dot:giga ${TOOLCHAIN_URL} -O ~/cache/${TOOLCHAIN}/cxarm.deb
-        else
+        elif [[ ${FILE_EXT} == zip ]]; then
+          curl -L "$TOOLCHAIN_URL" -o toolchain.zip
+          unzip -q toolchain.zip -d ~/cache/${TOOLCHAIN}
+          ~/cache/${TOOLCHAIN}/xpack-arm-none-eabi-gcc-14.2.1-1.1/bin/arm-none-eabi-gcc.exe --version
+        elif [[ ${FILE_EXT} == gz ]]; then
           wget --progress=dot:giga ${TOOLCHAIN_URL} -O toolchain.tar.gz
           tar -C ~/cache/${TOOLCHAIN} -xaf toolchain.tar.gz
+        else
+          echo "Unsupported toolchain file extension: ${FILE_EXT}"
+          exit 1
         fi
       shell: bash
 
@@ -47,8 +55,19 @@ runs:
         if [[ ${TOOLCHAIN} == arm-iar ]]; then
           sudo dpkg -i ~/cache/${TOOLCHAIN}/iar-lmsc-tools.deb
           sudo apt install -y ~/cache/${TOOLCHAIN}/cxarm.deb
-          echo >> $GITHUB_PATH "/opt/iar/cxarm/arm/bin"
+          TOOLCHAIN_PATH="/opt/iar/cxarm/arm/bin"
         else
-          echo >> $GITHUB_PATH `echo ~/cache/${TOOLCHAIN}/*/bin`
+          # Find the single toolchain bin directory
+          TOOLCHAIN_BIN_DIRS=(~/cache/${TOOLCHAIN}/*/bin)
+          if [[ ${#TOOLCHAIN_BIN_DIRS[@]} -ne 1 ]]; then
+            echo "Error: Expected exactly one toolchain bin directory, found ${#TOOLCHAIN_BIN_DIRS[@]}"
+            exit 1
+          fi
+          TOOLCHAIN_PATH="${TOOLCHAIN_BIN_DIRS[0]}"
         fi
+        # Convert to native path for Windows compatibility
+        if [[ "$RUNNER_OS" == "Windows" ]]; then
+          TOOLCHAIN_PATH=$(cygpath -w "$TOOLCHAIN_PATH")
+        fi
+        echo "$TOOLCHAIN_PATH" >> $GITHUB_PATH
       shell: bash

.github/actions/setup_toolchain/toolchain.json

@@ -2,6 +2,8 @@
   "aarch64-gcc": "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz",
   "arm-clang": "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-19.1.1/LLVM-ET-Arm-19.1.1-Linux-x86_64.tar.xz",
   "arm-gcc": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v14.2.1-1.1/xpack-arm-none-eabi-gcc-14.2.1-1.1-linux-x64.tar.gz",
+  "arm-gcc-macos-latest": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v14.2.1-1.1/xpack-arm-none-eabi-gcc-14.2.1-1.1-darwin-arm64.tar.gz",
+  "arm-gcc-windows-latest": "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download/v14.2.1-1.1/xpack-arm-none-eabi-gcc-14.2.1-1.1-win32-x64.zip",
   "msp430-gcc": "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/9_2_0_0/export/msp430-gcc-9.2.0.50_linux64.tar.bz2",
   "riscv-gcc": "https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-2/xpack-riscv-none-elf-gcc-13.2.0-2-linux-x64.tar.gz",
   "rx-gcc": "https://github.com/hathach/rx_device/releases/download/0.0.1/gcc-8.3.0.202411-GNURX-ELF.run",

.github/workflows/build.yml

@@ -15,7 +15,6 @@ on:
       - '.github/workflows/build_util.yml'
       - '.github/workflows/ci_set_matrix.py'
   pull_request:
-    branches: [ master ]
     paths:
       - 'src/**'
       - 'examples/**'
@@ -49,7 +48,7 @@ jobs:
         id: set-matrix-json
         run: |
           # build matrix
-          MATRIX_JSON=$(python .github/workflows/ci_set_matrix.py)
+          MATRIX_JSON=$(python .github/workflows/ci_set_matrix.py)/
           echo "matrix=$MATRIX_JSON"
           echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
           # hil matrix
@@ -127,19 +126,20 @@ jobs:
       one-per-family: true
 
   # ---------------------------------------
-  # Build Make on Windows/MacOS
+  # Build Make/CMake on Windows/MacOS
   # ---------------------------------------
-  make-os:
+  build-os:
     if: github.event_name == 'pull_request'
     uses: ./.github/workflows/build_util.yml
     strategy:
       fail-fast: false
       matrix:
         os: [windows-latest, macos-latest]
+        build-system: [ 'make', 'cmake' ]
     with:
       os: ${{ matrix.os }}
-      build-system: 'make'
-      toolchain: 'arm-gcc'
+      build-system: ${{ matrix.build-system }}
+      toolchain: 'arm-gcc-${{ matrix.os }}'
       build-args: '["stm32h7"]'
       one-per-family: true
 

.idea/cmake.xml

@@ -56,6 +56,13 @@
           </envs>
         </ADDITIONAL_GENERATION_ENVIRONMENT>
       </configuration>
+      <configuration PROFILE_NAME="espressif_s3_devkitc-DMA" ENABLED="false" TOOLCHAIN_NAME="ESP-IDF" GENERATION_OPTIONS="-DBOARD=espressif_s3_devkitc -DLOG=1 -DCFLAGS_CLI=&quot;-DCFG_TUD_DWC2_DMA_ENABLE=1 -DCFG_TUH_DWC2_DMA_ENABLE=1&quot;">
+        <ADDITIONAL_GENERATION_ENVIRONMENT>
+          <envs>
+            <env name="ESPBAUD" value="1500000" />
+          </envs>
+        </ADDITIONAL_GENERATION_ENVIRONMENT>
+      </configuration>
       <configuration PROFILE_NAME="espressif_p4_function_ev" ENABLED="false" TOOLCHAIN_NAME="ESP-IDF" GENERATION_OPTIONS="-DBOARD=espressif_p4_function_ev -DLOG=1">
         <ADDITIONAL_GENERATION_ENVIRONMENT>
           <envs>
@@ -90,9 +97,9 @@
       <configuration PROFILE_NAME="same54_xplained" ENABLED="false" GENERATION_OPTIONS="-DBOARD=same54_xplained -DLOG=1 -DLOGGER=RTT" />
       <configuration PROFILE_NAME="samg55_xplained" ENABLED="false" GENERATION_OPTIONS="-DBOARD=samg55_xplained" />
       <configuration PROFILE_NAME="feather_nrf52840_express" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=feather_nrf52840_express -DLOG=1 -DLOGGER=RTT -DMAX3421_HOST=1" />
-      <configuration PROFILE_NAME="pca10056" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=pca10056 -DLOG=1 -DLOGGER=RTT -DTRACE_ETM=1" />
-      <configuration PROFILE_NAME="pca10056-zephyr" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=pca10056 -DLOG=1 -DTRACE_ETM=1 -DRTOS=zephyr" BUILD_OPTIONS="-v" />
-      <configuration PROFILE_NAME="pca10095" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=pca10095 -DLOG=1 -DLOGGER=RTT -DTRACE_ETM=1" />
+      <configuration PROFILE_NAME="nrf52840dk" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=nrf52840dk -DLOG=1 -DLOGGER=RTT -DTRACE_ETM=1" />
+      <configuration PROFILE_NAME="nrf52840dk-zephyr" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=nrf52840dk -DLOG=1 -DTRACE_ETM=1 -DRTOS=zephyr" BUILD_OPTIONS="-v" />
+      <configuration PROFILE_NAME="nrf5340dk" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=nrf5340dk -DLOG=1 -DLOGGER=RTT -DTRACE_ETM=1" />
       <configuration PROFILE_NAME="metro m7 1011 sd" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=metro_m7_1011_sd -DLOG=1 -DLOGGER=RTT -DTRACE_ETM=1" />
       <configuration PROFILE_NAME="metro_m7_1011" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=metro_m7_1011 -DLOG=1 -DLOGGER=RTT" />
       <configuration PROFILE_NAME="rt1010 evk" ENABLED="false" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DBOARD=mimxrt1010_evk -DLOG=1 -DLOGGER=RTT" />

tools/get_deps.py

@@ -246,7 +246,7 @@ deps_optional = {
                     'imxrt kinetis_k32l2 kinetis_kl lpc51 lpc54 lpc55 mcx mm32 msp432e4 nrf saml2x '
                     'lpc11 lpc13 lpc15 lpc17 lpc18 lpc40 lpc43 '
                     'stm32c0 stm32f0 stm32f1 stm32f2 stm32f3 stm32f4 stm32f7 stm32g0 stm32g4 stm32h5 '
-                    'stm32h7 stm32h7rs stm32l0 stm32l1 stm32l4 stm32l5 stm32u0 stm32u5 stm32wb stm32wba'
+                    'stm32h7 stm32h7rs stm32l0 stm32l1 stm32l4 stm32l5 stm32u0 stm32u5 stm32wb stm32wba '
                     'sam3x samd11 samd21 samd51 samd5x_e5x same5x same7x saml2x samg '
                     'tm4c '],
     'lib/CMSIS_6': ['https://github.com/ARM-software/CMSIS_6.git',
@@ -343,7 +343,7 @@ def main():
 
         for f in families:
             for d in deps_optional:
-                if d not in deps and f in deps_optional[d][2]:
+                if d not in deps and f in deps_optional[d][2].split():
                     deps.append(d)
 
     if print_only: