From 6a982b805355212a4608e6766a5654479c8f040c Mon Sep 17 00:00:00 2001
From: John Wellbelove <jwellbelove@users.noreply.github.com>
Date: Thu, 9 Mar 2023 11:33:12 +0000
Subject: [PATCH] Renamed Github vs2022.yml to visual-studio.yml

---
 .../{vs2022.yml => visual-studio.yml}         |  0
 .github/workflows/vs2019.yml                  | 76 -------------------
 test/vs2022/etl.vcxproj                       |  3 +-
 test/vs2022/etl.vcxproj.filters               |  5 +-
 4 files changed, 2 insertions(+), 82 deletions(-)
 rename .github/workflows/{vs2022.yml => visual-studio.yml} (100%)
 delete mode 100644 .github/workflows/vs2019.yml

diff --git a/.github/workflows/vs2022.yml b/.github/workflows/visual-studio.yml
similarity index 100%
rename from .github/workflows/vs2022.yml
rename to .github/workflows/visual-studio.yml
diff --git a/.github/workflows/vs2019.yml b/.github/workflows/vs2019.yml
deleted file mode 100644
index 29a49bc5..00000000
--- a/.github/workflows/vs2019.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-name: vs2019
-on:
-  push:
-    branches: [ master, development]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build-windows-vs2019-stl:
-    name: Windows VS2019 Debug - STL
-    runs-on: [windows-2019]
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
-
-    - name: Build
-      run: |
-        git fetch --tags
-        cmake -G "Visual Studio 16 2019" -AWin32 -DBUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF ./
-        MSBuild.exe -version
-        MSBuild.exe .\etl.sln
-        
-    - name: Run tests
-      run: test/Debug/etl_tests.exe
-
-  build-windows-vs2019-no-stl:
-    name: Windows VS2019 Debug - No STL
-    runs-on: [windows-2019]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
-
-    - name: Build
-      run: |
-        git fetch --tags
-        cmake -G "Visual Studio 16 2019" -AWin32 -DBUILD_TESTS=ON -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF ./
-        MSBuild.exe -version
-        MSBuild.exe .\etl.sln
-        
-    - name: Run tests
-      run: test/Debug/etl_tests.exe
-
-  build-windows-vs2019-stl-force-cpp03:
-    name: Windows VS2019 Debug - STL - Force C++03
-    runs-on: [windows-2019]
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
-
-    - name: Build
-      run: |
-        git fetch --tags
-        cmake -G "Visual Studio 16 2019" -AWin32 -DBUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON ./
-        MSBuild.exe -version
-        MSBuild.exe .\etl.sln
-        
-    - name: Run tests
-      run: test/Debug/etl_tests.exe
-
diff --git a/test/vs2022/etl.vcxproj b/test/vs2022/etl.vcxproj
index 027d1bef..865905f6 100644
--- a/test/vs2022/etl.vcxproj
+++ b/test/vs2022/etl.vcxproj
@@ -12670,8 +12670,7 @@
     <None Include="..\..\.gitattributes" />
     <None Include="..\..\.github\workflows\clang.yml" />
     <None Include="..\..\.github\workflows\gcc.yml" />
-    <None Include="..\..\.github\workflows\vs2019.yml" />
-    <None Include="..\..\.github\workflows\vs2022.yml" />
+    <None Include="..\..\.github\workflows\visual-studio.yml" />
     <None Include="..\..\.gitignore" />
     <None Include="..\..\.gitmodules" />
     <None Include="..\..\appveyor.yml" />
diff --git a/test/vs2022/etl.vcxproj.filters b/test/vs2022/etl.vcxproj.filters
index 5895c01a..6358b1e7 100644
--- a/test/vs2022/etl.vcxproj.filters
+++ b/test/vs2022/etl.vcxproj.filters
@@ -3472,9 +3472,6 @@
     <None Include="..\..\.github\workflows\gcc.yml">
       <Filter>Resource Files\CI\Github</Filter>
     </None>
-    <None Include="..\..\.github\workflows\vs2019.yml">
-      <Filter>Resource Files\CI\Github</Filter>
-    </None>
     <None Include="..\runsanitychecks.sh">
       <Filter>Tests\Scripts</Filter>
     </None>
@@ -3529,7 +3526,7 @@
     <None Include="..\runtests-02.sh">
       <Filter>Tests\Scripts</Filter>
     </None>
-    <None Include="..\..\.github\workflows\vs2022.yml">
+    <None Include="..\..\.github\workflows\visual-studio.yml">
       <Filter>Resource Files\CI\Github</Filter>
     </None>
   </ItemGroup>