[CI] Fix images jobs files

So that they are triggered again on any change to the repo contents
(due to the repo structure).

Also - unpin the dependencies' versions as old ones tend to
be deleted from Fedora repos.

Co-Authored-By: Jan Marchel <jmarchel@7bulls.com>
Change-Id: I3f99f96d1a411dd5518098ad20d6ab90ff5d89fe
This commit is contained in:
Radosław Piliszek 2024-05-22 18:59:40 +02:00 committed by Radosław Piliszek
parent 2bf9748509
commit b37fe6858a
2 changed files with 24 additions and 3 deletions

View File

@ -11,7 +11,21 @@ RUN mkdir -p /solver
WORKDIR /solver WORKDIR /solver
# Development framework, dependencies # Development framework, dependencies
RUN dnf --assumeyes install gcc-c++-13.2.1-7.fc39 make-1:4.4.1-2.fc39 git-core-2.45.0-1.fc39 boost-devel-1.81.0-8.fc39 ccache-4.8.2-2.fc39 qpid-proton-cpp-devel-0.38.0-4.fc39 json-c-0.17-1.fc39 json-devel-3.11.2-3.fc39 json-glib-1.8.0-1.fc39 jsoncpp-1.9.5-5.fc39 jsoncpp-devel-1.9.5-5.fc39 coin-or-Couenne-0.5.8-12.fc39 wget-1.21.3-7.fc39 && \ RUN dnf --assumeyes update && dnf --assumeyes install \
gcc-c++ \
make \
git-core \
boost-devel \
ccache \
qpid-proton-cpp-devel \
json-c \
json-devel \
json-glib \
jsoncpp \
jsoncpp-devel \
coin-or-Couenne \
wget \
&& \
dnf clean all && \ dnf clean all && \
git clone https://github.com/jarro2783/cxxopts.git CxxOpts && \ git clone https://github.com/jarro2783/cxxopts.git CxxOpts && \
git clone https://github.com/GeirHo/TheronPlusPlus.git Theron++ && \ git clone https://github.com/GeirHo/TheronPlusPlus.git Theron++ && \
@ -36,7 +50,14 @@ RUN make SolverComponent -e THERON=./Theron++ AMPL_INCLUDE=./AMPL/amplapi/includ
FROM fedora:39 FROM fedora:39
WORKDIR /solver WORKDIR /solver
RUN dnf --assumeyes install boost-1.81.0-8.fc39 qpid-proton-cpp-0.38.0-4.fc39 json-c-0.17-1.fc39 json-glib-1.8.0-1.fc39 jsoncpp-1.9.5-5.fc39 coin-or-Couenne-0.5.8-12.fc39 && \ RUN dnf --assumeyes update && dnf --assumeyes install \
boost \
qpid-proton-cpp \
json-c \
json-glib \
jsoncpp \
coin-or-Couenne \
&& \
dnf clean all dnf clean all
COPY --from=builder /solver /solver COPY --from=builder /solver /solver

View File

@ -8,7 +8,7 @@
- nebulous-optimiser-solver-container-images - nebulous-optimiser-solver-container-images
description: Build the container images. description: Build the container images.
files: &image_files files: &image_files
- ^/ - ^
vars: &image_vars vars: &image_vars
promote_container_image_job: nebulous-optimiser-solver-upload-container-images promote_container_image_job: nebulous-optimiser-solver-upload-container-images
container_images: container_images: