Commit fae75f7a authored by Yuya Nishihara's avatar Yuya Nishihara
Browse files

merge with stable

Pipeline #24634 failed with stage
in 38 minutes and 11 seconds
......@@ -30,6 +30,22 @@ RUN yum install -y \
# Install Mercurial (so it can be called in our scripts)
RUN pip install mercurial
# Install recent cmake to allow libgit2 installation
RUN yum install -y wget && wget https://github.com/Kitware/CMake/releases/download/v3.20.5/cmake-3.20.5-linux-x86_64.sh && \
echo "f582e02696ceee81818dc3378531804b2213ed41c2a8bc566253d16d894cefab cmake-3.20.5-linux-x86_64.sh" | sha256sum --check && \
chmod +x ./cmake-3.20.5-linux-x86_64.sh && ./cmake-3.20.5-linux-x86_64.sh --skip-license --include-subdir --prefix=/ && \
ln -s /cmake-3.20.5-linux-x86_64/bin/cmake /usr/bin/cmake
# Install libgit2 to allow usage of pygit2
#RUN yum install -y libgit2 libgit2-devel
RUN yum install -y git openssl-devel && \
mkdir /libgit2 && \
git clone -b v1.1.1 https://github.com/libgit2/libgit2.git /libgit2 && \
mkdir /libgit2/build && cd /libgit2/build && cmake .. && cmake --build . --target install
# Install rust for rust-based optimizations
RUN yum install -y cargo
# Configure UTF-8 to avoid python3 issues
ENV LANG=en_US.UTF-8
ENV LC_ALL=en_US.UTF-8
FROM centos:centos8
FROM rockylinux/rockylinux:8.4
RUN yum install -y \
gcc \
gettext \
......@@ -38,5 +38,14 @@ RUN yum install -y \
# Install Mercurial (so it can be called in our scripts)
RUN pip3 install mercurial
# Install libgit2 to allow usage of pygit2
RUN yum install -y git openssl-devel && \
mkdir /libgit2 && \
git clone -b v1.1.1 https://github.com/libgit2/libgit2.git /libgit2 && \
mkdir /libgit2/build && cd /libgit2/build && cmake .. && cmake --build . --target install
# Install rust for rust-based optimizations
RUN yum install -y cargo
# wish is needed for Mercurial
RUN yum install tk -y
......@@ -52,16 +52,8 @@ iniparse==0.5 \
--hash=sha256:932e5239d526e7acb504017bb707be67019ac428a6932368e6851691093aa842 \
--hash=sha256:db6ef1d8a02395448e0e7b17ac0aa28b8d338b632bbd1ffca08c02ddae32cf97 \
# via -r contrib/packaging/venv_py3/requirements.txt.in
mercurial==5.8 \
--hash=sha256:0c21bb17eb1b2633d7c75d8ee67154a696b59f5c79bdf42b89676611c7a3b229 \
--hash=sha256:1087474dfd24913864cc3a9e9ffe01bf21ad9826a948d26836c1c3b1a405b437 \
--hash=sha256:3eb6715d404e179bc44af2daa9b32c117002e15e5872f6cbb37b1d6d9dff722d \
--hash=sha256:59f7882efd054723a06a1af10dc8cc1323ce5b6a9fe4e939df9ba645f43a8db9 \
--hash=sha256:724d5f24867353c922609f63d31697ec6a97eb0ef9473e56be8fb679597f6602 \
--hash=sha256:9c33793dfa0f9f770111311679144567bdf96c8912a216ae184c85b033737d15 \
--hash=sha256:e35c9526d8cee6be4d3e9ccb0c4450d4e2497e80a24ad24d8c02497365456fa9 \
--hash=sha256:f2e4fbb2e66021d4b2b3d758a01b77c1dafd6d6f80062082c302e045d0230742 \
--hash=sha256:fc5d6a8f6478d88ef83cdd0ab6d86ad68ee722bbdf4964e6a0b47c3c6ba5309f \
mercurial==5.8.1 \
--hash=sha256:81baa3fe2087bdda2dd119d7ea948f6badebaeb7b528a7d18b277e2ceb22b19b
# via -r contrib/packaging/venv_py3/requirements.txt.in
pycparser==2.20 \
--hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \
......
......@@ -56,6 +56,8 @@ rm -rf $RPM_BUILD_ROOT
echo $RPM_BUILD_ROOT
pip3 install -r %{requirements_txt} --prefix=%{buildroot}%{_prefix}/local/lib/thg-env --ignore-installed
# Mercurial binaries for CentOS are installed using rust support, so let's do the same for Mercurial shipped with Tortoisehg for CentOS
pip3 install mercurial --prefix=%{buildroot}%{_prefix}/local/lib/thg-env --ignore-installed --global-option="--rust"
export PYTHONPATH=%{buildroot}%{_prefix}/local/lib/thg-env/lib/python3.6/site-packages:%{buildroot}%{_prefix}/local/lib/thg-env/lib64/python3.6/site-packages
python3 setup.py install -O1 --skip-build --root %{buildroot}%{_prefix}/local/lib/thg-env
......@@ -81,7 +83,7 @@ export PYTHONPATH=%{_prefix}/local/lib/thg-env/lib/python3.6/site-packages/:\$PY
export PYTHONPATH=%{_prefix}/local/lib/thg-env/lib64/python3.6/site-packages/:\$PYTHONPATH
export PYTHONPATH=%{_prefix}/local/lib/thg-env/usr/lib/python3.6/site-packages/:\$PYTHONPATH
export PATH=%{_prefix}/local/lib/thg-env/bin:\$PATH
%{_prefix}/local/lib/thg-env/usr/bin/thg
%{_prefix}/local/lib/thg-env/usr/bin/thg "\$@"
EOF
chmod +x %{buildroot}%{_prefix}/local/bin/thg
......
......@@ -168,8 +168,8 @@ htmlhelp_basename = 'TortoiseHg'
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, document class [howto/manual]).
latex_documents = [
('index', 'TortoiseHg.tex', ur'TortoiseHg Documentation',
ur'Steve Borho and others', 'manual'),
('index', 'TortoiseHg.tex', u'TortoiseHg Documentation',
u'Steve Borho and others', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
......
......@@ -458,7 +458,7 @@ def _runcommand(ui, options, cmd, cmdfunc):
path = util.expandpath(output)
ostream = open(path, 'wb')
else:
ostream = sys.stderr
ostream = procutil.stderr
try:
from mercurial import lsprof
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment