Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
352 changes: 155 additions & 197 deletions .github/workflows/ci-master.yml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,9 @@ include(cmake/crc32c.cmake)
include(cmake/leveldb.cmake)
add_subdirectory(src)

# Ensure build info is generated early for all targets that need it
add_dependencies(core_interface generate_build_info)

include(cmake/tests.cmake)

include(Maintenance)
Expand Down
17 changes: 10 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This is a Dockerfile for firod.
FROM debian:bullseye AS build-image
FROM debian:bookworm AS build-image

# Install required system packages
RUN apt-get update && apt-get install -y \
Expand All @@ -15,7 +15,11 @@ RUN apt-get update && apt-get install -y \
m4 \
make \
pkg-config \
patch
patch \
m4 \
autoconf \
automake \
libtool
Comment on lines +18 to +22
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion | 🟠 Major

Remove duplicate dependency declarations.

Lines 18-22 duplicate dependencies already declared on lines 6-7 and 14 (m4, autoconf, automake, libtool). This is redundant and makes maintenance harder.

Apply this diff to remove duplicates:

     pkg-config \
-    patch \
-    m4 \
-    autoconf \
-    automake \
-    libtool
+    patch
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
patch \
m4 \
autoconf \
automake \
libtool
patch
🤖 Prompt for AI Agents
In Dockerfile around lines 18 to 22, the dependency list contains duplicate
entries (m4, autoconf, automake, libtool) that are already declared on lines 6-7
and 14; remove the redundant block at lines 18-22 so each dependency is declared
only once, keeping one canonical list (prefer the existing earlier declarations)
and ensure package ordering/line breaks remain valid after removal.


# Build Firo
COPY . /tmp/firo/
Expand All @@ -25,11 +29,10 @@ WORKDIR /tmp/firo
RUN cd depends && \
NO_QT=true make HOST=$(uname -m)-linux-gnu -j$(nproc)

RUN ./autogen.sh && \
./configure --without-gui --enable-tests --prefix=/tmp/firo/depends/$(uname -m)-linux-gnu && \
make -j$(nproc) && \
make check && \
make install
RUN cmake -B build -DCMAKE_TOOLCHAIN_FILE=$(pwd)/depends/$(uname -m)-linux-gnu/toolchain.cmake -DBUILD_GUI=OFF -DBUILD_TESTS=ON && \
cmake --build build -j$(nproc) && \
cd build && make test && \
cmake --install build --prefix /tmp/firo/depends/$(uname -m)-linux-gnu

# extract shared dependencies of firod and firo-cli
# copy relevant binaries to /usr/bin, the COPY --from cannot use $(uname -m) variable in argument
Expand Down
230 changes: 0 additions & 230 deletions Makefile.am

This file was deleted.

Loading
Loading