From 401c7eaf1b132722c78e7b06eec7fcc26f6d8e71 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 16 Jan 2025 23:27:18 +0100
Subject: [PATCH] Windows shouldnt need anymore special env setup

---
 .github/workflows/examples.yml | 35 +++++++---------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index cf43a39..ab64b14 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -1,4 +1,4 @@
-name: Examples
+name: CI Examples
 
 on:
   workflow_dispatch:      # Manually start a workflow
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-14]
+        os: [ubuntu-24.04, windows-2022, macos-15]
         example:
           - "examples/arduino-blink"
           - "examples/arduino-rmt-blink"
@@ -22,7 +22,7 @@ jobs:
           - "examples/arduino-zigbee-switch"
           - "examples/tasmota"
           - "examples/espidf-arduino-h2zero-BLE_scan"
-          - "examples/espidf-arduino-matter-light"
+          #- "examples/espidf-arduino-matter-light"
           - "examples/arduino-matter-light"
           - "examples/espidf-arduino-blink"
           - "examples/espidf-arduino-littlefs"
@@ -45,37 +45,16 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
-      - name: Install Windows dependencies
+          python-version: "3.13"
+      - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install wheel
-          pip install -U https://github.com/platformio/platformio/archive/develop.zip
+          pip install -U https://github.com/pioarduino/platformio-core/archive/refs/tags/v6.1.17b2.zip
           pio pkg install --global --platform file://.
-        if: "matrix.os == 'windows-2022'"
-        env:
-          PLATFORMIO_CORE_DIR: C:\plat
-          PLATFORMIO_PACKAGES_DIR: C:\plat\pack
-          PLATFORMIO_PLATFORMS_DIR: C:\plat\plat
-      - name: Build Windows examples
-        run: pio run -d ${{ matrix.example }}
-        if: "matrix.example != 'examples/tasmota' && matrix.os == 'windows-2022'"
-        env:
-          PLATFORMIO_CORE_DIR: C:\plat
-          PLATFORMIO_PACKAGES_DIR: C:\plat\pack
-          PLATFORMIO_PLATFORMS_DIR: C:\plat\plat
-      - name: Install Ubuntu Mac dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install wheel
-          pip install -U https://github.com/platformio/platformio/archive/develop.zip
-          pio pkg install --global --platform file://.
-        if: "matrix.os != 'windows-2022'"
       - name: git clone Tasmota and add to examples
         run: |
           git clone -b development --depth 1 https://github.com/arendst/Tasmota.git examples/tasmota
           cp examples/tasmota_platformio_override.ini examples/tasmota/platformio_override.ini
-        if: "matrix.example == 'examples/tasmota' && matrix.os != 'windows-2022'"
-      - name: Build Ubuntu Mac examples
+      - name: Build examples
         run: pio run -d ${{ matrix.example }}
-        if: "matrix.os != 'windows-2022'"