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.
This commit is contained in:
23rd 2020-01-19 17:16:10 +03:00 committed by John Preston
parent c13d637502
commit 37cdd78bda
2 changed files with 11 additions and 2 deletions

View File

@ -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

View File

@ -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%