always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake(ci): Fixup from main

Browse Source
This commit is contained in:
Corentin Le Molgat
2024-11-21 09:34:20 +01:00
parent 3ad2454c66
commit 0b42a43e29
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/docker/almalinux/java.Dockerfile
View File

@@ -1,9 +1,11 @@
FROM ortools/cmake:almalinux_swig AS env
RUN dnf -y update \
&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
&& dnf clean all \
&& rm -rf /var/cache/dnf
RUN alternatives --set java /usr/lib/jvm/java-11-openjdk*.x86_64/bin/java
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
FROM env AS devel
WORKDIR /home/project

2
cmake/docker/fedora/dotnet.Dockerfile
View File

@@ -14,7 +14,7 @@ COPY . .
FROM devel AS build
RUN cmake -version
RUN cmake -S. -Bbuild -DBUILD_DOTNET=ON -DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF
RUN cmake --build build --target all -v
RUN OPENSSL_ENABLE_SHA1_SIGNATURES=1 cmake --build build --target all -v
RUN cmake --build build --target install -v
FROM build AS test

4
cmake/docker/rockylinux/java.Dockerfile
View File

@@ -1,9 +1,11 @@
FROM ortools/cmake:rockylinux_swig AS env
RUN dnf -y update \
&& dnf -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel maven \
&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
&& dnf clean all \
&& rm -rf /var/cache/dnf
RUN alternatives --set java /usr/lib/jvm/java-11-openjdk-11.*.x86_64/bin/java
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
FROM env AS devel
WORKDIR /home/project

2
cmake/docker/system_deps/python.Dockerfile
View File

@@ -32,7 +32,7 @@ RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test
FROM env AS install_env
WORKDIR /home/sample
COPY --from=build /home/project/build/python/dist/*.whl .
RUN python -m pip install *.whl
RUN python -m pip install --break-system-packages *.whl
FROM install_env AS install_devel
COPY cmake/samples/python .