synchronizing private and public main branches

Merge remote-tracking branch 'accellera-official/main' into HEAD
accellera-official · Feb 29, 2024 · 46b36a2 · 46b36a2
2 parents 56e600b + f0df9d5
commit 46b36a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/docker/alma.dockerfile b/docker/alma.dockerfile
@@ -14,7 +14,9 @@ RUN dnf install -y \
 # Copy the current directory contents into the container at /app
 COPY . /app
 
-RUN cmake -B BUILD/RELEASE/BUILD -DCMAKE_INSTALL_PREFIX=$PWD/BUILD/RELEASE .
+RUN cmake -B BUILD/RELEASE/BUILD -DCMAKE_INSTALL_PREFIX=$PWD/BUILD/RELEASE -DCMAKE_CXX_FLAGS="-Werror" .
 RUN cmake --build BUILD/RELEASE/BUILD/ --parallel
+RUN cmake -B BUILD/RELEASE_STATIC/BUILD -DCMAKE_INSTALL_PREFIX=$PWD/BUILD/RELEASE -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_SHARED_LIBS=OFF .
+RUN cmake --build BUILD/RELEASE_STATIC/BUILD/ --parallel
 
-CMD ["/bin/bash", "-c", "make -j `nproc` -C BUILD/RELEASE/BUILD/ check"]
+CMD ["/bin/bash", "-c", "make -j `nproc` -C BUILD/RELEASE/BUILD/ check && make -j `nproc` -C BUILD/RELEASE_STATIC/BUILD/ check"]
diff --git a/docker/ubuntu.dockerfile b/docker/ubuntu.dockerfile
@@ -15,7 +15,9 @@ RUN apt-get update && \
 # Copy the current directory contents into the container at /app
 COPY . /app
 
-RUN cmake -B BUILD/RELEASE/BUILD -DCMAKE_INSTALL_PREFIX=$PWD/BUILD/RELEASE .
+RUN cmake -B BUILD/RELEASE/BUILD -DCMAKE_INSTALL_PREFIX=$PWD/BUILD/RELEASE -DCMAKE_CXX_FLAGS="-Werror" .
 RUN cmake --build BUILD/RELEASE/BUILD/ --parallel
+RUN cmake -B BUILD/RELEASE_STATIC/BUILD -DCMAKE_INSTALL_PREFIX=$PWD/BUILD/RELEASE -DCMAKE_CXX_FLAGS="-Werror" -DBUILD_SHARED_LIBS=OFF .
+RUN cmake --build BUILD/RELEASE_STATIC/BUILD/ --parallel
 
-CMD ["/bin/bash", "-c", "make -j `nproc` -C BUILD/RELEASE/BUILD/ check"]
+CMD ["/bin/bash", "-c", "make -j `nproc` -C BUILD/RELEASE/BUILD/ check && make -j `nproc` -C BUILD/RELEASE_STATIC/BUILD/ check"]