[nautilus/wip/oholy/dockerfile-uncrustify] ci: Build uncrustify from sources
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/oholy/dockerfile-uncrustify] ci: Build uncrustify from sources
- Date: Wed, 14 Jul 2021 15:18:48 +0000 (UTC)
commit c645351d79bbdcf8a7241305b074c5164408be82
Author: Ondrej Holy <oholy redhat com>
Date: Wed Jul 14 09:36:07 2021 +0200
ci: Build uncrustify from sources
The uncrustify package from rawhide contains the following bug:
https://github.com/uncrustify/uncrustify/issues/3233. Let's build the
uncrustify package from sources as the master branch already contains the
following fix: https://github.com/uncrustify/uncrustify/pull/3235. So the
workaround from commit 3ad2de33daa5a5df7f1e90acc593b6b246dfb450 can be
reverted now.
.gitlab/Dockerfile | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 8043417d4..601829db7 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -1,6 +1,6 @@
FROM fedora:rawhide
-RUN dnf install --nogpg -y dnf-plugins-core uncrustify findutils git libportal-devel tracker3-miners
python3-gobject dbus-daemon libhandy1-devel \
+RUN dnf install --nogpg -y dnf-plugins-core findutils git libportal-devel tracker3-miners python3-gobject
dbus-daemon libhandy1-devel \
&& dnf builddep --nogpg -y nautilus \
&& dnf clean all
@@ -24,3 +24,15 @@ RUN dnf builddep --nogpg -y libhandy \
&& ninja -C _build install \
&& cd .. \
&& rm -rf libhandy
+
+RUN dnf builddep --nogpg -y uncrustify \
+ && dnf clean all \
+ && git clone --depth 1 https://github.com/uncrustify/uncrustify.git \
+ && cd uncrustify \
+ && mkdir build \
+ && cd build \
+ && cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
+ && make \
+ && make install \
+ && cd ../.. \
+ && rm -rf uncrustify
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]