Reverting workaround for Windows, and trying clang++-14 for linux-build

Signed-off-by: Vedant <[email protected]>
vrnimje · Oct 29, 2023 · d3920cc · d3920cc
1 parent 316d843
commit d3920cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git 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
@@ -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