From 21c36d10fbdf60142e0efb294b1e9a06c6c7ec42 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:02:53 +0200
Subject: [PATCH 1/2] Use pio v6.1.7

---
 .gitpod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 0425a416bb30..a15a00f9c89b 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,5 +1,5 @@
 tasks:
-  - command: pip3 install -U platformio && platformio run -e tasmota
+  - command: pip3 install -U platformio==6.1.7 && platformio run -e tasmota
 
 image:
   file: .gitpod.Dockerfile

From b485d400c2b5d45aec229cc3a90cd43baf143de3 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 5 Jul 2023 23:09:28 +0200
Subject: [PATCH 2/2] pin pio to v6.1.7

---
 .github/workflows/Tasmota_build_devel.yml  | 8 ++++----
 .github/workflows/Tasmota_build_master.yml | 8 ++++----
 .github/workflows/build_all_the_things.yml | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml
index 1d7d248520cd..8f4c70d38392 100644
--- a/.github/workflows/Tasmota_build_devel.yml
+++ b/.github/workflows/Tasmota_build_devel.yml
@@ -101,7 +101,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install wheel
-          pip install -U platformio
+          pip install -U platformio==6.1.7
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
       - name: Upload safeboot firmware artifacts
@@ -139,7 +139,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install wheel
-          pip install -U platformio
+          pip install -U platformio==6.1.7
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
       - name: Upload firmware artifacts
@@ -182,7 +182,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install wheel
-          pip install -U platformio
+          pip install -U platformio==6.1.7
       - name: Download safeboot firmwares
         uses: actions/download-artifact@v3
         with:
@@ -219,7 +219,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install wheel
-          pip install -U platformio
+          pip install -U platformio==6.1.7
       - name: Download safeboot firmwares
         uses: actions/download-artifact@v3
         with:
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index 6b6c4eaf0041..9387150fd5af 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install wheel
-          pip install -U platformio
+          pip install -U platformio==6.1.7
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
       - name: Upload safeboot firmware artifacts
@@ -77,7 +77,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install wheel
-          pip install -U platformio
+          pip install -U platformio==6.1.7
       - name: Run PlatformIO
         run: platformio run -e ${{ matrix.variant }}
       - name: Upload firmware artifacts
@@ -120,7 +120,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install wheel
-          pip install -U platformio
+          pip install -U platformio==6.1.7
       - name: Download safeboot firmwares
         uses: actions/download-artifact@v3
         with:
@@ -157,7 +157,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install wheel
-          pip install -U platformio
+          pip install -U platformio==6.1.7
       - name: Download safeboot firmwares
         uses: actions/download-artifact@v3
         with:
diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml
index 3f89214e3dad..366577f0fa22 100644
--- a/.github/workflows/build_all_the_things.yml
+++ b/.github/workflows/build_all_the_things.yml
@@ -35,7 +35,7 @@ jobs:
         run: |
           pip install wheel
           #python -m pip install --upgrade pip
-          pip install -U platformio
+          pip install -U platformio==6.1.7
           #platformio upgrade --dev
           #platformio update
       - name: Run PlatformIO
@@ -63,7 +63,7 @@ jobs:
         run: |
           pip install wheel
           #python -m pip install --upgrade pip
-          pip install -U platformio
+          pip install -U platformio==6.1.7
           #platformio upgrade --dev
           #platformio update
       - name: Run PlatformIO
@@ -122,7 +122,7 @@ jobs:
         run: |
           pip install wheel
           #python -m pip install --upgrade pip
-          pip install -U platformio
+          pip install -U platformio==6.1.7
           #platformio upgrade --dev
           #platformio update
       - name: Run PlatformIO
@@ -150,7 +150,7 @@ jobs:
         run: |
           pip install wheel
           #python -m pip install --upgrade pip
-          pip install -U platformio
+          pip install -U platformio==6.1.7
           #platformio upgrade --dev
           #platformio update
       - name: Run PlatformIO