From 1921a059932aa9f46ae9ea42aa2f6f88b918db2b Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Wed, 11 Nov 2020 17:12:35 -0800 Subject: appveyor artifact generation fix presence of the dynamic library in produced package --- appveyor.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 31894d3..b4c27ef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,10 @@ version: 1.0.{build} environment: matrix: + - COMPILER: "gcc" + PLATFORM: "mingw64" + - COMPILER: "gcc" + PLATFORM: "mingw32" - COMPILER: "visual" CONFIGURATION: "Debug" PLATFORM: "x64" @@ -14,10 +18,6 @@ environment: CONFIGURATION: "Release" PLATFORM: "Win32" - COMPILER: "gcc" - PLATFORM: "mingw64" - - COMPILER: "gcc" - PLATFORM: "mingw32" - - COMPILER: "gcc" PLATFORM: "clang" install: @@ -50,7 +50,7 @@ build_script: make -C programs lz4 && make -C tests fullbench && make -C tests fuzzer && - make -C lib lib + make -C lib lib V=1 ) ELSE ( make -C programs lz4 CC=clang MOREFLAGS="--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion" && make -C tests fullbench CC=clang MOREFLAGS="--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion" && @@ -67,18 +67,18 @@ build_script: COPY lib\lz4hc.h bin\include\ && COPY lib\lz4frame.h bin\include\ && COPY lib\liblz4.a bin\static\liblz4_static.lib && - COPY lib\dll\liblz4.* bin\dll\ && + COPY lib\dll\* bin\dll\ && COPY lib\dll\example\Makefile bin\example\ && COPY lib\dll\example\fullbench-dll.* bin\example\ && COPY lib\dll\example\README.md bin\ && COPY programs\lz4.exe bin\lz4.exe ) - if [%COMPILER%]==[gcc] if [%PLATFORM%]==[mingw64] ( - 7z.exe a bin\lz4_x64.zip NEWS .\bin\lz4.exe .\bin\README.md .\bin\example .\bin\dll .\bin\static .\bin\include && + 7z.exe a -bb1 bin\lz4_x64.zip NEWS .\bin\lz4.exe .\bin\README.md .\bin\example .\bin\dll .\bin\static .\bin\include && appveyor PushArtifact bin\lz4_x64.zip ) - if [%COMPILER%]==[gcc] if [%PLATFORM%]==[mingw32] ( - 7z.exe a bin\lz4_x86.zip NEWS .\bin\lz4.exe .\bin\README.md .\bin\example .\bin\dll .\bin\static .\bin\include && + 7z.exe a -bb1 bin\lz4_x86.zip NEWS .\bin\lz4.exe .\bin\README.md .\bin\example .\bin\dll .\bin\static .\bin\include && appveyor PushArtifact bin\lz4_x86.zip ) - if [%COMPILER%]==[gcc] (COPY tests\*.exe programs\) -- cgit v0.12