removes using chocolatey

Author: kdschlosser

.github/workflows/macOS.yml

@@ -12,13 +12,13 @@ jobs:
     - uses: actions/checkout@v4
     - uses: ammaraskar/gcc-problem-matcher@master
 
-    - name: Install Dependencies
-      run: |
-        brew install --force gcc libffi cmake ninja make
-        brew install --force --cask gcc-arm-embedded
+    - name: Install arm-none-eabi-gcc
+      uses: carlosperate/[email protected]
+      with:
+        release: '9-2019-q4' # The arm-none-eabi-gcc release to use.
 
-    - name: Build macOS port
-      run: python3 make.py unix submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
+    - name: Install Dependencies
+      run: brew install --force gcc libffi cmake ninja make
 
     - name: Build ESP32 port
       run: python3 make.py esp32 submodules clean mpy_cross BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
@@ -28,3 +28,6 @@ jobs:
 
     - name: Build Raspberry Pi PICO port
       run: python3 make.py rp2 submodules clean mpy_cross BOARD=RPI_PICO DISPLAY=rgb_display INDEV=gt911
+
+    - name: Build macOS port
+        run: python3 make.py unix submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer

.github/workflows/unix.yml

@@ -12,12 +12,12 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - uses: ammaraskar/gcc-problem-matcher@master
-
+    - name: Install arm-none-eabi-gcc
+      uses: carlosperate/[email protected]
+      with:
+        release: '9-2019-q4' # The arm-none-eabi-gcc release to use.
     - name: Install Deps
-      run: sudo apt-get install --force-yes -y build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev gcc-arm-none-eabi
-
-    - name: Build Unix port
-      run: python3 make.py unix submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
+      run: sudo apt-get install --force-yes -y build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev
 
     - name: Build ESP32 port
       run: python3 make.py esp32 submodules clean mpy_cross BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
@@ -28,6 +28,9 @@ jobs:
     - name: Build Raspberry Pi PICO port
       run: python3 make.py rp2 submodules clean mpy_cross BOARD=RPI_PICO DISPLAY=rgb_display INDEV=gt911
 
+    - name: Build Unix port
+        run: python3 make.py unix submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
+
 
 
 

.github/workflows/windows.yml

@@ -11,16 +11,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-
+    - name: Install arm-none-eabi-gcc
+      uses: carlosperate/[email protected]
+      with:
+        release: '9-2019-q4' # The arm-none-eabi-gcc release to use.
     - name: Install Dependencies
       run: |
-        choco install make
-        choco install gcc-arm-embedded
+        winget install ezwinports.make
         python3 -m pip install pyMSVC
 
-    - name: Build Windows port
-      run: python3 make.py windows submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
-
     - name: Build ESP32 port
       run: python3 make.py esp32 submodules clean mpy_cross BOARD=ESP32_GENERIC_S3 BOARD_VARIANT=SPIRAM_OCT DISPLAY=rgb_display INDEV=gt911
 
@@ -30,4 +29,7 @@ jobs:
     - name: Build Raspberry Pi PICO port
       run: python3 make.py rp2 submodules clean mpy_cross BOARD=RPI_PICO DISPLAY=rgb_display INDEV=gt911
 
+    - name: Build Windows port
+        run: python3 make.py windows submodules clean mpy_cross DISPLAY=sdl_display INDEV=sdl_pointer
+