From: Martin Matuska <martin@matuska.org>
Date: Sun, 9 Feb 2020 07:15:58 +0000 (+0100)
Subject: CI Windows: download zlib and bzip2 from cloned repositories
X-Git-Tag: v3.4.2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=987caefe9193c91f45cd8cf903ada83f67036395;p=thirdparty%2Flibarchive.git

CI Windows: download zlib and bzip2 from cloned repositories
---

diff --git a/build/ci/github_actions/ci.cmd b/build/ci/github_actions/ci.cmd
index 37e86c406..954d515c3 100755
--- a/build/ci/github_actions/ci.cmd
+++ b/build/ci/github_actions/ci.cmd
@@ -18,17 +18,17 @@ IF "%1"=="deplibs" (
     MKDIR build_ci\libs
   )
   CD build_ci\libs
-  IF NOT EXIST zlib-%ZLIB_VERSION%.tar.gz (
-    curl -o zlib-%ZLIB_VERSION%.tar.gz https://www.zlib.net/zlib-%ZLIB_VERSION%.tar.gz
+  IF NOT EXIST zlib-%ZLIB_VERSION%.zip (
+    curl -L -o zlib-%ZLIB_VERSION%.zip https://github.com/libarchive/zlib/archive/v%ZLIB_VERSION%.zip
   )
   IF NOT EXIST zlib-%ZLIB_VERSION% (
-    tar -x -z -f zlib-%ZLIB_VERSION%.tar.gz
+    tar -x -f zlib-%ZLIB_VERSION%.zip
   )
   IF NOT EXIST bzip2-%BZIP2_VERSION%.zip (
-    curl -L -o bzip2-%BZIP2_VERSION%.zip https://gitlab.com/federicomenaquintero/bzip2/-/archive/%BZIP2_VERSION%/bzip2-%BZIP2_VERSION%.zip
+    curl -L -o bzip2-%BZIP2_VERSION%.zip https://github.com/libarchive/bzip2/archive/%BZIP2_VERSION%.zip
   )
   IF NOT EXIST bzip2-%BZIP2_VERSION% (
-    tar -x -z -f bzip2-%BZIP2_VERSION%.zip
+    tar -x -f bzip2-%BZIP2_VERSION%.zip
   )
   CD zlib-%ZLIB_VERSION%
   IF "%BE%"=="mingw-gcc" (