Skip to content

Commit 70c565a

Browse files
authored
Merge pull request #51 from LibrePCB/devtools-rustfmt
devtools: Update to Ubuntu 24.04, install rustfmt & debian-copyright-sorter
2 parents e53262a + f97a193 commit 70c565a

1 file changed

Lines changed: 17 additions & 6 deletions

File tree

devtools/Dockerfile

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
1-
FROM ubuntu:23.10
1+
FROM ubuntu:24.04
22

33
# Install APT packages
44
RUN apt-get -q update \
55
&& apt-get -qy install \
6-
# Documentation tools: Doxygen, Graphviz, qhelpgenerator
6+
# Documentation tools: Doxygen, Graphviz, qhelpgenerator, rustdoc
77
doxygen \
88
graphviz \
99
qt6-documentation-tools \
10-
# Formatting tools: clang-format, qmlformat, xmlsort
10+
rustc \
11+
# Formatting tools: clang-format, qmlformat, rustfmt, xmlsort
1112
clang-format-15 \
1213
libxml-filter-sort-perl \
14+
rustfmt \
1315
qt6-declarative-dev-tools \
14-
# Stylecheck tools: git
16+
# Stylecheck tools: git, rust-clippy
1517
git \
18+
rust-clippy \
1619
# Python for custom formatting scripts, flake8 etc.
1720
python3 \
21+
python3-debian \
1822
python3-pip \
1923
# Tools used on CI
2024
curl \
2125
file \
2226
openssl \
27+
wget \
2328
&& apt-get clean
2429

2530
# Configure default clang-format
@@ -32,5 +37,11 @@ RUN ln -s /usr/lib/qt6/libexec/qhelpgenerator /usr/local/bin/qhelpgenerator
3237
ENV PIP_BREAK_SYSTEM_PACKAGES=1
3338
RUN pip3 install \
3439
cmakelang==0.6.13 \
35-
flake8==7.0.0 \
36-
reuse==3.0.2
40+
flake8==7.1.1 \
41+
reuse==5.0.2
42+
43+
# Install debian-copyright-sorter from
44+
# https://salsa.debian.org/debian/debian-copyright-sorter
45+
ARG DCS_URL="https://salsa.debian.org/debian/debian-copyright-sorter/-/raw/46a40920761e738b79658ebe8f2ea6eb8e5aabd0/debian_copyright_sorter.py"
46+
RUN wget -c "${DCS_URL}" -O /usr/local/bin/debian-copyright-sorter \
47+
&& chmod a+x /usr/local/bin/debian-copyright-sorter

0 commit comments

Comments
 (0)