From b3a311fa6510d0c3bac14e0c09a6abe1c379a5e9 Mon Sep 17 00:00:00 2001
From: Mustii <26250654+mustiikhalil@users.noreply.github.com>
Date: Tue, 1 Jul 2025 21:27:51 +0200
Subject: [PATCH 1/3] Moves to use swift-actions@next until final release is
 out

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 07d6876603f..ee4b20fc8d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -500,7 +500,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
-    - uses: swift-actions/setup-swift@v2
+    - uses: swift-actions/setup-swift@next
       with:
         swift-version: ${{ matrix.swift }}
     - name: Get swift version

From bcf10f14677dcc6445f61324bd15dc64c4ce45b5 Mon Sep 17 00:00:00 2001
From: Mustii <26250654+mustiikhalil@users.noreply.github.com>
Date: Tue, 1 Jul 2025 21:42:08 +0200
Subject: [PATCH 2/3] Migrates to vapor that uses swiftly actions

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ee4b20fc8d4..aebd34fd38e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -500,9 +500,9 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
-    - uses: swift-actions/setup-swift@next
+    - uses: vapor/swiftly-action@v0.2
       with:
-        swift-version: ${{ matrix.swift }}
+        toolchain: ${{ matrix.swift }}
     - name: Get swift version
       run: swift --version
     - name: test

From 0df16a54bfea872b50eb40c49ab3d1b77f4d298a Mon Sep 17 00:00:00 2001
From: Mustii <26250654+mustiikhalil@users.noreply.github.com>
Date: Tue, 1 Jul 2025 21:56:28 +0200
Subject: [PATCH 3/3] Trying to use windows 2022

---
 .github/workflows/build.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aebd34fd38e..7ad3079ca8c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -129,7 +129,7 @@ jobs:
 
   build-cpp-std:
     name: Build Windows C++
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       matrix:
         std: [11, 14, 17, 20, 23]
@@ -140,7 +140,7 @@ jobs:
       uses: microsoft/setup-msbuild@v1.1
     - name: cmake
       run: >
-        cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release
+        cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release
         -DFLATBUFFERS_STRICT_MODE=ON
         -DFLATBUFFERS_CPP_STD=${{ matrix.std }}
         -DFLATBUFFERS_BUILD_CPP17=${{ matrix.std >= 17 && 'On' || 'Off'}}
@@ -157,14 +157,14 @@ jobs:
       contents: write
     outputs:
       digests: ${{ steps.hash.outputs.hashes }}
-    name: Build Windows 2019
-    runs-on: windows-2019
+    name: Build Windows 2022
+    runs-on: windows-2022
     steps:
     - uses: actions/checkout@v3
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1.1
     - name: cmake
-      run: cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_CPP17=ON -DFLATBUFFERS_STRICT_MODE=ON .
+      run: cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_CPP17=ON -DFLATBUFFERS_STRICT_MODE=ON .
     - name: build
       run: msbuild.exe FlatBuffers.sln /p:Configuration=Release /p:Platform=x64
     - name: test
@@ -344,13 +344,13 @@ jobs:
 
   build-generator-windows:
     name: Check Generated Code on Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - uses: actions/checkout@v3
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1.1
     - name: cmake
-      run: cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_CPP17=ON -DFLATBUFFERS_STRICT_MODE=ON .
+      run: cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DFLATBUFFERS_BUILD_CPP17=ON -DFLATBUFFERS_STRICT_MODE=ON .
     - name: build
       run: msbuild.exe FlatBuffers.sln /p:Configuration=Release /p:Platform=x64
     - name: Generate