diff options
| author | Ondrej Holy <oholy@redhat.com> | 2021-07-14 09:36:07 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2021-07-14 17:13:30 +0200 |
| commit | c645351d79bbdcf8a7241305b074c5164408be82 (patch) | |
| tree | 70f543ae40d5d1e010c43a2898f27fb9d4c3bdd5 /.gitlab | |
| parent | 0865620acf46312dabb1be3b9827086c410394c2 (diff) | |
| download | nautilus-c645351d79bbdcf8a7241305b074c5164408be82.tar.gz | |
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.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/Dockerfile | 14 |
1 files changed, 13 insertions, 1 deletions
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 |