From a75c2bd3ad7f895f1192dd72a7dac02055e3a1f1 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 20 Mar 2022 13:19:55 +0000 Subject: [PATCH] Modified VS2019 Github Actions --- .github/workflows/vs2019.yml | 14 +++++++------- .gitignore | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/vs2019.yml b/.github/workflows/vs2019.yml index 30c42b53..cc802066 100644 --- a/.github/workflows/vs2019.yml +++ b/.github/workflows/vs2019.yml @@ -1,7 +1,7 @@ name: vs2019 on: push: - branches: [ master ] + branches: [ master development] pull_request: branches: [ master ] @@ -21,9 +21,9 @@ jobs: - name: Build run: | - cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF ./ + 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 + MSBuild.exe .\etl_unit_tests.sln - name: Run tests run: ./test/debug/etl_tests.exe @@ -43,9 +43,9 @@ jobs: - name: Build run: | - cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF ./ + 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 + MSBuild.exe .\etl_unit_tests.sln - name: Run tests run: ./test/debug/etl_tests.exe @@ -65,9 +65,9 @@ jobs: - name: Build run: | - cmake -G "Visual Studio 16 2019" -DBUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON ./ + 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 + MSBuild.exe .\etl_unit_tests.sln - name: Run tests run: ./test/debug/etl_tests.exe diff --git a/.gitignore b/.gitignore index 55b56e9b..7c35f2b8 100644 --- a/.gitignore +++ b/.gitignore @@ -358,3 +358,4 @@ test/build-etl_initializer_list-Desktop_x86_windows_msvc2019_pe_32bit-Debug test/build-etl_initializer_list-GCC-Debug test/etl_initializer_list/etl_initializer_list.vcxproj.filters test/etl_initializer_list/build-make +test/vs-build