From d3920cc64df1446d028537890853942c3b82c80e Mon Sep 17 00:00:00 2001
From: Vedant <vedantnimjed@gmail.com>
Date: Sun, 29 Oct 2023 12:24:59 +0530
Subject: [PATCH 1/3] Reverting workaround for Windows, and trying clang++-14
 for linux-build

Signed-off-by: Vedant <vedantnimjed@gmail.com>
---
 .github/workflows/linux_build.yml            | 8 ++++----
 .github/workflows/windows_build_no_boost.yml | 5 -----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
index 14b97a6..7ba6159 100644
--- a/.github/workflows/linux_build.yml
+++ b/.github/workflows/linux_build.yml
@@ -2,7 +2,7 @@ name: Linux Build
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, win_rev_linux_fix ]
     paths:
       - ".github/workflows/linux_build.yml"
       - "include/**"
@@ -27,12 +27,12 @@ jobs:
       matrix:
         cxx:
           - g++-10
-          - clang++-12
+          - clang++-14
         include:
           - cxx: g++-10
             compiler: g++-10
-          - cxx: clang++-12
-            compiler: clang++-12
+          - cxx: clang++-14
+            compiler: clang++-14
     env:
       CXX: ${{matrix.cxx}}
       CMAKE_PREFIX_PATH: ${{github.workspace}}/.local
diff --git a/.github/workflows/windows_build_no_boost.yml b/.github/workflows/windows_build_no_boost.yml
index d0f1bb8..a9292b9 100644
--- a/.github/workflows/windows_build_no_boost.yml
+++ b/.github/workflows/windows_build_no_boost.yml
@@ -26,11 +26,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Remove Strawberry Perl from PATH
-      run: |
-        $env:PATH = $env:PATH -replace "C:\\Strawberry\\c\\bin;", "" 
-        "PATH=$env:PATH" | Out-File -FilePath $env:GITHUB_ENV -Append
-
     - name: Configure CMake
       run: cmake -S . -B build "-DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT\scripts\buildsystems\vcpkg.cmake" -DQUICK_FTXUI_FETCH_BOOST=ON
         

From fd62a9d75743b8699646da69969a6faa3e861e37 Mon Sep 17 00:00:00 2001
From: Vedant <vedantnimjed@gmail.com>
Date: Sun, 29 Oct 2023 12:31:12 +0530
Subject: [PATCH 2/3] Testing windows build, and updating Catch2 to latest
 version

Signed-off-by: Vedant <vedantnimjed@gmail.com>
---
 .github/workflows/linux_build.yml            | 6 +++---
 .github/workflows/windows_build_no_boost.yml | 2 +-
 CMakeLists.txt                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
index 7ba6159..9a79667 100644
--- a/.github/workflows/linux_build.yml
+++ b/.github/workflows/linux_build.yml
@@ -27,12 +27,12 @@ jobs:
       matrix:
         cxx:
           - g++-10
-          - clang++-14
+          - clang++-12
         include:
           - cxx: g++-10
             compiler: g++-10
-          - cxx: clang++-14
-            compiler: clang++-14
+          - cxx: clang++-12
+            compiler: clang++-12
     env:
       CXX: ${{matrix.cxx}}
       CMAKE_PREFIX_PATH: ${{github.workspace}}/.local
diff --git a/.github/workflows/windows_build_no_boost.yml b/.github/workflows/windows_build_no_boost.yml
index a9292b9..fa61beb 100644
--- a/.github/workflows/windows_build_no_boost.yml
+++ b/.github/workflows/windows_build_no_boost.yml
@@ -2,7 +2,7 @@ name: Windows Build Boost Fetch
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, win_rev_linux_fix ]
     paths:
       - ".github/workflows/windows_build_no_boost.yml"
       - "include/**"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28b0b23..a5c8e2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ if(QUICK_FTXUI_TESTS)
     FetchContent_Declare(
         Catch2
         GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-        GIT_TAG v3.0.1 # or a later release
+        GIT_TAG v3.4.0 # or a later release
     )
 
     FetchContent_MakeAvailable(Catch2)

From 1d29cf86d484c20238f985d2667ab321cf2154c5 Mon Sep 17 00:00:00 2001
From: Vedant <vedantnimjed@gmail.com>
Date: Sun, 29 Oct 2023 12:37:56 +0530
Subject: [PATCH 3/3] Removing branch name, as workflows are now successful

Signed-off-by: Vedant <vedantnimjed@gmail.com>
---
 .github/workflows/linux_build.yml            | 2 +-
 .github/workflows/windows_build_no_boost.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
index 9a79667..14b97a6 100644
--- a/.github/workflows/linux_build.yml
+++ b/.github/workflows/linux_build.yml
@@ -2,7 +2,7 @@ name: Linux Build
 
 on:
   push:
-    branches: [ master, win_rev_linux_fix ]
+    branches: [ master ]
     paths:
       - ".github/workflows/linux_build.yml"
       - "include/**"
diff --git a/.github/workflows/windows_build_no_boost.yml b/.github/workflows/windows_build_no_boost.yml
index fa61beb..dbce7fc 100644
--- a/.github/workflows/windows_build_no_boost.yml
+++ b/.github/workflows/windows_build_no_boost.yml
@@ -2,12 +2,12 @@ name: Windows Build Boost Fetch
 
 on:
   push:
-    branches: [ master, win_rev_linux_fix ]
+    branches: [ master ]
     paths:
       - ".github/workflows/windows_build_no_boost.yml"
       - "include/**"
       - "src/**"
-      - "tests/**"
+      - "tests/**", win_rev_linux_fix
       - "CMakeLists.txt"
   pull_request:
     branches: [ master ]