From 5915f7dc7bf83228d106d22675054d912e15e330 Mon Sep 17 00:00:00 2001 From: Oz Date: Sun, 1 Oct 2023 18:57:52 +0200 Subject: [PATCH 1/3] Test appveyor --- appveyor.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2d1462dc..2b1d7d8c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,21 +13,21 @@ environment: APPVEYOR_YML_DISABLE_PS_LINUX: true matrix: - - compiler: msvc - arch: x86 - flags: -DBIT7Z_STATIC_RUNTIME=OFF -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON + #- compiler: msvc + # arch: x86 + # flags: -DBIT7Z_STATIC_RUNTIME=OFF -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON - - compiler: msvc - arch: x64 - flags: -DBIT7Z_STATIC_RUNTIME=OFF -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON + #- compiler: msvc + # arch: x64 + # flags: -DBIT7Z_STATIC_RUNTIME=OFF -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON - - compiler: msvc_mt - arch: x86 - flags: -DBIT7Z_STATIC_RUNTIME=ON -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON + #- compiler: msvc_mt + # arch: x86 + # flags: -DBIT7Z_STATIC_RUNTIME=ON -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON - - compiler: msvc_mt - arch: x64 - flags: -DBIT7Z_STATIC_RUNTIME=ON -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON + #- compiler: msvc_mt + # arch: x64 + # flags: -DBIT7Z_STATIC_RUNTIME=ON -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON - compiler: mingw arch: x86 From 595c973f70f868f97e4fa8b5938d623a395d2791 Mon Sep 17 00:00:00 2001 From: Oz Date: Sun, 1 Oct 2023 19:01:49 +0200 Subject: [PATCH 2/3] Test fix for appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2b1d7d8c..3bfb81cc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -169,7 +169,7 @@ for: - git submodule update --init --recursive - mkdir build - cd build - - if "%compiler%"=="mingw" (rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe") + # - if "%compiler%"=="mingw" (rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe") build_script: - cmake .. -G "Ninja" %flags% -DCMAKE_BUILD_TYPE=Release From 90cb242cc13a4a4abeeecfdf3320ade3ab5b8467 Mon Sep 17 00:00:00 2001 From: Oz Date: Sun, 1 Oct 2023 19:12:35 +0200 Subject: [PATCH 3/3] Restore build configurations in appveyor --- appveyor.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3bfb81cc..87421ccb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,21 +13,21 @@ environment: APPVEYOR_YML_DISABLE_PS_LINUX: true matrix: - #- compiler: msvc - # arch: x86 - # flags: -DBIT7Z_STATIC_RUNTIME=OFF -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON + - compiler: msvc + arch: x86 + flags: -DBIT7Z_STATIC_RUNTIME=OFF -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON - #- compiler: msvc - # arch: x64 - # flags: -DBIT7Z_STATIC_RUNTIME=OFF -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON + - compiler: msvc + arch: x64 + flags: -DBIT7Z_STATIC_RUNTIME=OFF -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON - #- compiler: msvc_mt - # arch: x86 - # flags: -DBIT7Z_STATIC_RUNTIME=ON -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON + - compiler: msvc_mt + arch: x86 + flags: -DBIT7Z_STATIC_RUNTIME=ON -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON - #- compiler: msvc_mt - # arch: x64 - # flags: -DBIT7Z_STATIC_RUNTIME=ON -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON + - compiler: msvc_mt + arch: x64 + flags: -DBIT7Z_STATIC_RUNTIME=ON -DBIT7Z_VS_LIBNAME_OUTDIR_STYLE=ON - compiler: mingw arch: x86 @@ -169,7 +169,6 @@ for: - git submodule update --init --recursive - mkdir build - cd build - # - if "%compiler%"=="mingw" (rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe") build_script: - cmake .. -G "Ninja" %flags% -DCMAKE_BUILD_TYPE=Release