From 37cdd78bdae9b4b105be2c548549797646017cb7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 19 Jan 2020 17:16:10 +0300
Subject: [PATCH] Fixed Github CI builds.

 - Added prefix to configure zlib for macOS.
 - Removed hardcoded path to Python 2 version
 and added a search for existing versions.
---
 .github/workflows/mac.yml |  2 +-
 .github/workflows/win.yml | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index ebfb141e6..b307a4700 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -102,7 +102,7 @@ jobs:
 
           git clone $GIT/desktop-app/zlib.git
           cd zlib
-          CFLAGS="$MIN_MAC $UNGUARDED" LDFLAGS="$MIN_MAC" ./configure
+          CFLAGS="$MIN_MAC $UNGUARDED" LDFLAGS="$MIN_MAC" ./configure --prefix=$PREFIX
           make -j$(nproc)
           sudo make install
 
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 46b83e924..702a3651f 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -23,7 +23,6 @@ jobs:
     env:
       SDK: "10.0.18362.0"
       VC: "call vcvars32.bat && cd Libraries"
-      PY2: 'C:\hostedtoolcache\windows\Python\2.7.16\x64'
       GIT: "https://github.com"
       QT: "5_12_5"
       OPENSSL_VER: "1_1_1"
@@ -186,6 +185,16 @@ jobs:
         run: |
           cd %LibrariesPath%
 
+          echo Find any version of Python 2.
+          for /D %%a in (C:\hostedtoolcache\windows\Python\2.*) do (
+            SET PY2=%%a\x64
+          )
+          IF [%PY2%] == [] (
+            echo Python 2 is not found.
+            exit 1
+          )
+          echo Found %PY2%.
+
           git clone %GIT%/telegramdesktop/gyp.git
           cd gyp
           SET PATH=%PY2%;%cd%;%PATH%