Add pygit2 dependency. (#9497)
* Add debian stretch backports repo as discussed with @autrilla * Add libgit2-dev dependency that's needed by pygit2 (via debian stretch to get the proper version that's required by up-to-date pygit2) * Add pygit 0.27.1 Fixes #9496
This commit is contained in:
Родитель
e35eee35dd
Коммит
d6e85cea5a
|
@ -46,11 +46,13 @@ addons:
|
|||
sources:
|
||||
- elasticsearch-5.x
|
||||
packages:
|
||||
- cmake
|
||||
- swig
|
||||
- elasticsearch
|
||||
- gettext
|
||||
- librsvg2-bin
|
||||
- pngcrush
|
||||
- uuid
|
||||
|
||||
services:
|
||||
- mysql
|
||||
|
@ -62,6 +64,8 @@ before_install:
|
|||
- mysql -e 'create database olympia;'
|
||||
- export GOPATH=$HOME/go
|
||||
- export PATH=$HOME/usr/local/go/bin:$GOPATH/bin:$PATH
|
||||
- export LIBGIT2=$(pwd)/libgit2/install/
|
||||
- export LD_LIBRARY_PATH=$(pwd)/libgit2/install/lib
|
||||
|
||||
install:
|
||||
- nvm current
|
||||
|
@ -69,6 +73,7 @@ install:
|
|||
- nvm install 8
|
||||
- nvm use 8
|
||||
- pip install --upgrade pip wheel setuptools tox==3.2.1 tox-travis==0.10
|
||||
- ./scripts/travis-install-libgit2.sh
|
||||
|
||||
before_script:
|
||||
- mysql --version
|
||||
|
|
|
@ -13,8 +13,8 @@ RUN apt-get update && apt-get install -y \
|
|||
&& rm -rf /var/lib/apt/lists/*
|
||||
RUN cat /etc/pki/gpg/GPG-KEY-nodesource | apt-key add -
|
||||
ADD docker/debian-stretch-nodesource-repo /etc/apt/sources.list.d/nodesource.list
|
||||
ADD docker/debian-stretch-backports-repo /etc/apt/sources.list.d/backports.list
|
||||
|
||||
# Upgrade git
|
||||
RUN apt-get update && apt-get install -y \
|
||||
# General (dev-) dependencies
|
||||
bash-completion \
|
||||
|
@ -47,6 +47,11 @@ RUN apt-get update && apt-get install -y \
|
|||
uuid \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN apt-get update && apt-get -t stretch-backports install -y \
|
||||
# For git-based files storage backend
|
||||
libgit2-dev \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Compile required locale
|
||||
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y \
|
|||
&& rm -rf /var/lib/apt/lists/*
|
||||
RUN cat /etc/pki/gpg/GPG-KEY-nodesource | apt-key add -
|
||||
ADD docker/debian-stretch-nodesource-repo /etc/apt/sources.list.d/nodesource.list
|
||||
ADD docker/debian-stretch-backports-repo /etc/apt/sources.list.d/backports.list
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
# General (dev-) dependencies
|
||||
|
@ -52,6 +53,11 @@ RUN apt-get update && apt-get install -y \
|
|||
pngcrush \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN apt-get update && apt-get -t stretch-backports install -y \
|
||||
# For git-based files storage backend
|
||||
libgit2-dev \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Compile required locale
|
||||
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
|
||||
ENV LANG en_US.UTF-8
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
deb http://deb.debian.org/debian stretch-backports main
|
|
@ -367,3 +367,15 @@ typing==3.6.6 \
|
|||
--hash=sha256:a4c8473ce11a65999c8f59cb093e70686b6c84c98df58c1dae9b3b196089858a \
|
||||
--hash=sha256:57dcf675a99b74d64dacf6fba08fb17cf7e3d5fdff53d4a30ea2a5e7e52543d4 \
|
||||
--hash=sha256:4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d
|
||||
pygit2==0.27.1 \
|
||||
--hash=sha256:10404e6c933d5b08ff2a3caf21cd947e75c6bbc246fafad70c7b35d97c423e69 \
|
||||
--hash=sha256:1aa5ba1d59370bda158950ba4849bb6e59f13ac7e6fca5e392bfd873bd2c1cf9 \
|
||||
--hash=sha256:577bf6cc906945b179d58bbee9278dba2ed6f5348f0797f27b3af3cb034cb4a3 \
|
||||
--hash=sha256:6f258fdd433d2c109c24817a53653c6e55e068066185d639fff30f70d565c7b0 \
|
||||
--hash=sha256:8961b34611d127310a1fb3d1dbf798ef560c148abd8cd0c46a6ed14b332fbabe \
|
||||
--hash=sha256:b1f613772fc6913df7ef0c3aab75e9abbbf360a8dfcb9cb8bba27d75f82e1fe5 \
|
||||
--hash=sha256:bede5107ea3051883adc20d7b564a7925c00620fa2f7bf17410c407936632c82 \
|
||||
--hash=sha256:d1729fec36b02909af6f7cec3d8881ac77aee093ac3dd43646e6484868238f9d \
|
||||
--hash=sha256:e882c284cb5912431702262cdc0d745d26c293bc8caac1fa39eb8ca21b8c2a54 \
|
||||
--hash=sha256:f55b0f4f0ddbee3c0eccd4589d00896dc1e307ad3981968716b5c6d061ea6b07 \
|
||||
--hash=sha256:fd13398c7fb5b113b2c3d6181f4d5157696e0ea8b57b65be8946dc4ba6cc01b9
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
#!/usr/bin/env bash
|
||||
set -o errexit -o nounset
|
||||
|
||||
LIBGIT2_VERSION="0.27.4"
|
||||
|
||||
if [ -d "libgit2" ]; then
|
||||
rm -rf libgit2/
|
||||
fi
|
||||
|
||||
mkdir libgit2
|
||||
|
||||
wget https://github.com/libgit2/libgit2/archive/v${LIBGIT2_VERSION}.tar.gz
|
||||
tar -xf v${LIBGIT2_VERSION}.tar.gz -C ./libgit2 --strip-components=1
|
||||
|
||||
cd libgit2
|
||||
mkdir build && cd build
|
||||
cmake .. -DCMAKE_INSTALL_PREFIX=../install -DBUILD_CLAR=OFF
|
||||
cmake --build . --target install
|
Загрузка…
Ссылка в новой задаче