Merge branch 'master' into build/multicore

build: add cache to ./configure with -C flag
Add the -C flag to ./configure to enable caching, reducing redundant resource fetching during builds when packages and the machine remain unchanged. Caching may cause issues only if applied across different machines or if packages are modified, neither of which is the case during the build.
2025-09-16 22:33:50 +00:00 · 2025-09-02 15:31:41 +02:00 · 2025-09-02 15:21:18 +02:00 · 2025-09-02 14:45:48 +02:00
4 changed files with 13 additions and 10 deletions
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -5,6 +5,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  autoconf \
  autoconf-archive \
  automake \
+  ca-certificates \
  expect \
  gcc \
  git \
@@ -36,7 +37,7 @@ RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src

 #RUN git clone https://github.com/boothj5/stabber
-RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
+RUN git clone --depth 1 https://git.jabber.space/devs/libstrophe-gh.git libstrophe

 #WORKDIR /usr/src/stabber
 #RUN ./bootstrap.sh
@@ -47,7 +48,7 @@ RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
-RUN make
+RUN make -j$(nproc)
 RUN make install

 WORKDIR /usr/src/profanity
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -9,6 +9,7 @@ RUN dnf install -y \
  autoconf-archive \
  automake \
  awk \
+  ca-certificates \
  expect-devel \
  gcc \
  git \
@@ -56,11 +57,11 @@ WORKDIR /usr/src

 WORKDIR /usr/src
 RUN mkdir -p /usr/src/libstrophe
-RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
+RUN git clone --depth 1 https://git.jabber.space/devs/libstrophe-gh.git libstrophe
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
-RUN make
+RUN make -j$(nproc)
 RUN make install

 RUN mkdir -p /usr/src/profanity
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -6,6 +6,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  autoconf \
  autoconf-archive \
  automake \
+  ca-certificates \
  expect \
  gcc \
  git \
@@ -37,7 +38,7 @@ RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src

 #RUN git clone https://github.com/boothj5/stabber
-RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
+RUN git clone --depth 1 https://git.jabber.space/devs/libstrophe-gh.git libstrophe

 # TODO: Re-enable once libmicrohttpd-dev has been updated.
 #WORKDIR /usr/src/stabber
@@ -49,7 +50,7 @@ RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
-RUN make
+RUN make -j$(nproc)
 RUN make install

 WORKDIR /usr/src/profanity
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -121,11 +121,11 @@ esac
 case "$ARCH" in
    linux*)
         echo
-         echo "--> Building with ./configure ${tests[0]} --enable-valgrind $*"
+         echo "--> Building with ./configure -C ${tests[0]} --enable-valgrind $*"
         echo

         # shellcheck disable=SC2086
-        ./configure ${tests[0]} --enable-valgrind $*
+        ./configure -C ${tests[0]} --enable-valgrind $*

        $MAKE CC="${CC}"
        if grep '^ID=' /etc/os-release | grep -q -e debian; then
@@ -140,11 +140,11 @@ esac
 for features in "${tests[@]}"
 do
    echo
-    echo "--> Building with ./configure ${features} $*"
+    echo "--> Building with ./configure -C ${features} $*"
    echo

    # shellcheck disable=SC2086
-    ./configure $features $*
+    ./configure -C $features $*

    $MAKE CC="${CC}"
    $MAKE check
Author	SHA1	Message	Date
jabber.developer	8877e1eed7	Merge branch 'master' into build/multicore All checks were successful CI / Check spelling (pull_request) Successful in 21s Details CI / Test C API Documentation Generation (pull_request) Successful in 26s Details CI / Check coding style (pull_request) Successful in 35s Details CI / Test Python API Documentation Generation (pull_request) Successful in 27s Details CI / Linux (ubuntu) (pull_request) Successful in 15m24s Details CI / Linux (debian) (pull_request) Successful in 15m38s Details CI / Linux (arch) (pull_request) Successful in 18m26s Details	2025-09-16 22:33:50 +00:00
Jabber Developer	14a19c38b2	build: add cache to ./configure with -C flag All checks were successful CI / Check spelling (pull_request) Successful in 17s Details CI / Check coding style (pull_request) Successful in 32s Details CI / Linux (debian) (pull_request) Successful in 9m59s Details CI / Linux (arch) (pull_request) Successful in 12m14s Details CI / Linux (ubuntu) (pull_request) Successful in 12m44s Details Add the -C flag to ./configure to enable caching, reducing redundant resource fetching during builds when packages and the machine remain unchanged. Caching may cause issues only if applied across different machines or if packages are modified, neither of which is the case during the build.	2025-09-02 15:31:41 +02:00
Jabber Developer	7a833963ad	build: use local libstrophe version and limit depth `--depth 1` flag ensures that only latest version is loaded (since there is no need to sync full git) Using local libstrophe version increases speed of fetching	2025-09-02 15:21:18 +02:00
Jabber Developer	8ed922f827	build: Add multithreading to `make` All checks were successful CI / Check spelling (pull_request) Successful in 18s Details CI / Check coding style (pull_request) Successful in 31s Details CI / Linux (debian) (pull_request) Successful in 11m2s Details CI / Linux (arch) (pull_request) Successful in 13m12s Details CI / Linux (ubuntu) (pull_request) Successful in 16m3s Details nproc is a standard util that prints amount of available processes. -j is a flag that specifies how many cores can be utilized by `make` (default is 1) -j$(nproc) allows to use all the available machine cores, potentially significantly speeding up completion of CI actions	2025-09-02 14:45:48 +02:00