diff --git a/bazel/README.md b/bazel/README.md index 22b2e8bf0b..64527c5981 100644 --- a/bazel/README.md +++ b/bazel/README.md @@ -59,12 +59,12 @@ You must compile OR-Tools using C++20: * on UNIX: ```sh - bazel build --cxxopt=-std=c++20 //...:all + bazel build --cxxopt=-std=c++17 ... ``` * on Windows when using MSVC: ```sh - bazel build --cxxopt="-std:c++20" //...:all + bazel build --cxxopt="-std:c++20" ... ``` ## Testing @@ -74,12 +74,12 @@ You may run tests using: * on UNIX: ```sh - bazel test --cxxopt=-std=c++20 //...:all + bazel test --cxxopt=-std=c++17 ... ``` * on Windows when using MSVC: ```sh - bazel test --cxxopt="-std:c++20" //...:all + bazel test --cxxopt="-std:c++20" ... ``` ## Integration diff --git a/bazel/docker/alpine/Dockerfile b/bazel/docker/alpine/Dockerfile index 80af7e1f99..eb4c28c166 100644 --- a/bazel/docker/alpine/Dockerfile +++ b/bazel/docker/alpine/Dockerfile @@ -27,7 +27,7 @@ COPY . . FROM devel AS build RUN bazel version -RUN bazel build --host_javabase=@local_jdk//:jdk --cxxopt=-std=c++17 ... +RUN bazel build -s --host_javabase=@local_jdk//:jdk --cxxopt=-std=c++17 ... FROM build AS test -RUN bazel test --host_javabase=@local_jdk//:jdk --cxxopt=-std=c++17 ... +RUN bazel test --host_javabase=@local_jdk//:jdk --cxxopt=-std=c++17 --test_output=errors ... diff --git a/bazel/docker/archlinux/Dockerfile b/bazel/docker/archlinux/Dockerfile index 5dadbe498f..abc4a1edaa 100644 --- a/bazel/docker/archlinux/Dockerfile +++ b/bazel/docker/archlinux/Dockerfile @@ -16,7 +16,7 @@ COPY . . FROM devel AS build RUN bazel version -RUN bazel build -c opt --cxxopt=-std=c++17 ... +RUN bazel build -s -c opt --cxxopt=-std=c++17 ... FROM build AS test -RUN bazel test -c opt --cxxopt=-std=c++17 ... +RUN bazel test -c opt --cxxopt=-std=c++17 --test_output=errors ... diff --git a/bazel/docker/centos/Dockerfile b/bazel/docker/centos/Dockerfile index 6f9c4dbe55..63d5012efd 100644 --- a/bazel/docker/centos/Dockerfile +++ b/bazel/docker/centos/Dockerfile @@ -32,7 +32,7 @@ COPY . . FROM devel AS build RUN bazel version -RUN bazel build -c opt --cxxopt=-std=c++17 ... +RUN bazel build -s -c opt --cxxopt=-std=c++17 ... FROM build AS test -RUN bazel test -c opt --cxxopt=-std=c++17 ... +RUN bazel test -c opt --cxxopt=-std=c++17 --test_output=errors ... diff --git a/bazel/docker/debian/Dockerfile b/bazel/docker/debian/Dockerfile index 20fea73d49..70f49e0187 100644 --- a/bazel/docker/debian/Dockerfile +++ b/bazel/docker/debian/Dockerfile @@ -30,7 +30,7 @@ COPY . . FROM devel AS build RUN bazel version -RUN bazel build -c opt --cxxopt=-std=c++17 ... +RUN bazel build -s -c opt --cxxopt=-std=c++17 ... FROM build AS test -RUN bazel test -c opt --cxxopt=-std=c++17 ... +RUN bazel test -c opt --cxxopt=-std=c++17 --test_output=errors ... diff --git a/bazel/docker/fedora/Dockerfile b/bazel/docker/fedora/Dockerfile index b7c1dfa0b9..57d05109c7 100644 --- a/bazel/docker/fedora/Dockerfile +++ b/bazel/docker/fedora/Dockerfile @@ -29,4 +29,4 @@ RUN bazel version RUN bazel build -c opt --cxxopt=-std=c++17 ... FROM build AS test -RUN bazel test -c opt --cxxopt=-std=c++17 ... +RUN bazel test -c opt --cxxopt=-std=c++17 --test_output=errors ... diff --git a/bazel/docker/opensuse/Dockerfile b/bazel/docker/opensuse/Dockerfile index a9c5fd5d07..66d0b32cab 100644 --- a/bazel/docker/opensuse/Dockerfile +++ b/bazel/docker/opensuse/Dockerfile @@ -29,4 +29,4 @@ RUN bazel version RUN bazel build -c opt --cxxopt=-std=c++17 ... FROM build AS test -RUN bazel test -c opt --cxxopt=-std=c++17 ... +RUN bazel test -c opt --cxxopt=-std=c++17 --test_output=errors ... diff --git a/bazel/docker/ubuntu/Dockerfile b/bazel/docker/ubuntu/Dockerfile index ae9f48c51c..6c2d6efd79 100644 --- a/bazel/docker/ubuntu/Dockerfile +++ b/bazel/docker/ubuntu/Dockerfile @@ -30,4 +30,4 @@ RUN bazel version RUN bazel build -c opt --cxxopt=-std=c++17 ... FROM build AS test -RUN bazel test -c opt --cxxopt=-std=c++17 ... +RUN bazel test -c opt --cxxopt=-std=c++17 --test_output=errors ...