From b1f898ec829a79b0adc7afb1e8ffd923c3a5432f Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 16:15:56 -0700 Subject: [PATCH 01/13] added srcPackage to list of branch producing artifacts --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 1f092574c..07ce12ca0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,7 @@ only: - dev - master + - srcPackage environment: matrix: - COMPILER: "gcc" From b94d08c566fb6f658a2c53d992662cfee1647480 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 16:23:23 -0700 Subject: [PATCH 02/13] commented src archive lines --- appveyor.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 07ce12ca0..c2760b0e8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -82,15 +82,17 @@ sh -c "%SCRIPT%" && ( if [%COMPILER%]==[gcc] if [%ARTIFACT%]==[true] ECHO Creating artifacts && - ECHO %cd% && - make clean && 7z a -ttar -so zstd-src.tar * && + REM ECHO %cd% && + REM make clean && + REM 7z a -ttar -so zstd-src.tar * && lib\dll\example\build_package.bat && cd programs\ && make DEBUGFLAGS= clean zstd && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe && appveyor PushArtifact zstd-win-binary-%PLATFORM%.zip && cp zstd.exe ..\bin\zstd.exe && - cd .. && zstd --ultra -22 zstd-src.tar && - appveyor PushArtifact zstd-src.tar.zst && + cd .. && + REM programs\zstd --ultra -22 zstd-src.tar && + REM appveyor PushArtifact zstd-src.tar.zst && cd bin\ && 7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * && appveyor PushArtifact zstd-win-release-%PLATFORM%.zip ) From 97bc1aec477508100e6d85dfa2fb7048363af16a Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 16:24:54 -0700 Subject: [PATCH 03/13] removed src artifact lines --- appveyor.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c2760b0e8..7a660c39f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -82,17 +82,12 @@ sh -c "%SCRIPT%" && ( if [%COMPILER%]==[gcc] if [%ARTIFACT%]==[true] ECHO Creating artifacts && - REM ECHO %cd% && - REM make clean && - REM 7z a -ttar -so zstd-src.tar * && lib\dll\example\build_package.bat && cd programs\ && make DEBUGFLAGS= clean zstd && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe && appveyor PushArtifact zstd-win-binary-%PLATFORM%.zip && cp zstd.exe ..\bin\zstd.exe && cd .. && - REM programs\zstd --ultra -22 zstd-src.tar && - REM appveyor PushArtifact zstd-src.tar.zst && cd bin\ && 7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * && appveyor PushArtifact zstd-win-release-%PLATFORM%.zip ) From a75104d8f8ac3b8b96aa4c2ccf8dda4385ec38de Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 16:27:28 -0700 Subject: [PATCH 04/13] added path print --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 7a660c39f..5b914ae01 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -82,6 +82,7 @@ sh -c "%SCRIPT%" && ( if [%COMPILER%]==[gcc] if [%ARTIFACT%]==[true] ECHO Creating artifacts && + ECHO %cd% && lib\dll\example\build_package.bat && cd programs\ && make DEBUGFLAGS= clean zstd && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe && From a59dac279a9d99095f0db4283a1133c0ada72618 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 16:36:18 -0700 Subject: [PATCH 05/13] added tar command --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 5b914ae01..76a5c99af 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -83,6 +83,8 @@ ( if [%COMPILER%]==[gcc] if [%ARTIFACT%]==[true] ECHO Creating artifacts && ECHO %cd% && + make clean && + 7z a -ttar zstd-src.tar * && lib\dll\example\build_package.bat && cd programs\ && make DEBUGFLAGS= clean zstd && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe && From 17e937bcd03b5142340f22b3d11e48aea36fc67e Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 16:49:34 -0700 Subject: [PATCH 06/13] git clone for clean src tar --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 76a5c99af..e39c9cd1a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -83,8 +83,8 @@ ( if [%COMPILER%]==[gcc] if [%ARTIFACT%]==[true] ECHO Creating artifacts && ECHO %cd% && - make clean && - 7z a -ttar zstd-src.tar * && + git clone --depth 1 --branch %APPVEYOR_REPO_BRANCH% https://github.com/facebook/zstd" + 7z a -ttar zstd-src.tar zstd && lib\dll\example\build_package.bat && cd programs\ && make DEBUGFLAGS= clean zstd && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe && From b42ffb91f74d77d05d1b4b81a019ace498bbe981 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 16:52:32 -0700 Subject: [PATCH 07/13] git clone master branch (hardcoded) --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e39c9cd1a..bcb62b74c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -83,7 +83,7 @@ ( if [%COMPILER%]==[gcc] if [%ARTIFACT%]==[true] ECHO Creating artifacts && ECHO %cd% && - git clone --depth 1 --branch %APPVEYOR_REPO_BRANCH% https://github.com/facebook/zstd" + git clone --depth 1 --branch master https://github.com/facebook/zstd" 7z a -ttar zstd-src.tar zstd && lib\dll\example\build_package.bat && cd programs\ && make DEBUGFLAGS= clean zstd && From 308f405c736480fc88274967b2213ccd6d2f2e93 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 17:06:11 -0700 Subject: [PATCH 08/13] export zstd/master from github using svn --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index bcb62b74c..3d964cc25 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -83,8 +83,8 @@ ( if [%COMPILER%]==[gcc] if [%ARTIFACT%]==[true] ECHO Creating artifacts && ECHO %cd% && - git clone --depth 1 --branch master https://github.com/facebook/zstd" - 7z a -ttar zstd-src.tar zstd && + svn export https://github.com/facebook/zstd/branches/master && + 7z a -ttar zstd-src.tar master && lib\dll\example\build_package.bat && cd programs\ && make DEBUGFLAGS= clean zstd && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe && From fa294b85905c3c6658b9bd54a666355900685378 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 17:20:05 -0700 Subject: [PATCH 09/13] created zstd archive from git archive --- appveyor.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3d964cc25..198347776 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -83,15 +83,18 @@ ( if [%COMPILER%]==[gcc] if [%ARTIFACT%]==[true] ECHO Creating artifacts && ECHO %cd% && - svn export https://github.com/facebook/zstd/branches/master && - 7z a -ttar zstd-src.tar master && lib\dll\example\build_package.bat && cd programs\ && make DEBUGFLAGS= clean zstd && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe && appveyor PushArtifact zstd-win-binary-%PLATFORM%.zip && cp zstd.exe ..\bin\zstd.exe && - cd .. && - cd bin\ && 7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * && + git clone --depth 1 --branch master https://github.com/facebook/zstd && + cd zstd && + git archive --format=tar master -o zstd-src.tar && + ..\zstd -19 zstd-src.tar && + appveyor PushArtifact zstd-src.tar.zst && + cd ..\..\bin\ && + 7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * && appveyor PushArtifact zstd-win-release-%PLATFORM%.zip ) ) From 2489e71ff1b0ed39e403f891ae5337c53f7cadf3 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 17:40:53 -0700 Subject: [PATCH 10/13] added sha256 sig --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 198347776..ae609df09 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -93,6 +93,8 @@ git archive --format=tar master -o zstd-src.tar && ..\zstd -19 zstd-src.tar && appveyor PushArtifact zstd-src.tar.zst && + certUtil -hashfile zstd-src.tar.zst SHA256 > zstd-src.sig.sha256 && + appveyor PushArtifact zstd-src.sig.sha256 && cd ..\..\bin\ && 7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * && appveyor PushArtifact zstd-win-release-%PLATFORM%.zip From 956a3b7006e0a6c1a78c46517b45b51896ebf9fb Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 17:52:16 -0700 Subject: [PATCH 11/13] clean certutil output --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ae609df09..3cc657abd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -93,7 +93,7 @@ git archive --format=tar master -o zstd-src.tar && ..\zstd -19 zstd-src.tar && appveyor PushArtifact zstd-src.tar.zst && - certUtil -hashfile zstd-src.tar.zst SHA256 > zstd-src.sig.sha256 && + $(CertUtil -hashfile zstd-src.tar.zst SHA256)[1] -replace " ","" > zstd-src.sig.sha256 && appveyor PushArtifact zstd-src.sig.sha256 && cd ..\..\bin\ && 7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * && From d9b2cbf6505c06516857b90328fb002eaaf1f8dc Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 17:57:11 -0700 Subject: [PATCH 12/13] restored certutil command line --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3cc657abd..ae609df09 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -93,7 +93,7 @@ git archive --format=tar master -o zstd-src.tar && ..\zstd -19 zstd-src.tar && appveyor PushArtifact zstd-src.tar.zst && - $(CertUtil -hashfile zstd-src.tar.zst SHA256)[1] -replace " ","" > zstd-src.sig.sha256 && + certUtil -hashfile zstd-src.tar.zst SHA256 > zstd-src.sig.sha256 && appveyor PushArtifact zstd-src.sig.sha256 && cd ..\..\bin\ && 7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * && From 6356b007fb5b970afd5cd37d0041d5c0be0c711f Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 23 Mar 2018 17:57:37 -0700 Subject: [PATCH 13/13] make artifacts ande extended tests only on master --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ae609df09..b098fd452 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,9 +2,7 @@ version: 1.0.{build} branches: only: - - dev - master - - srcPackage environment: matrix: - COMPILER: "gcc"