diff --git a/.github/workflows/bazel_linux.yml b/.github/workflows/bazel_linux.yml
index 3487f21d6d..9e8f27c53a 100644
--- a/.github/workflows/bazel_linux.yml
+++ b/.github/workflows/bazel_linux.yml
@@ -30,6 +30,16 @@ jobs:
       - name: Check Bazel
         run: bazel version
       - name: Build
-        run: bazel build -c opt --cxxopt=-std=c++17 --subcommands=true //ortools/... //examples/...
+        run: >
+          bazel build
+          -c opt
+          --action_env=BAZEL_CXXOPTS="-std=c++17"
+          --subcommands=true
+          ortools/... examples/...
       - name: Test
-        run: bazel test -c opt --cxxopt=-std=c++17 --test_output=errors //ortools/... //examples/...
+        run: >
+          bazel test
+          -c opt
+          --action_env=BAZEL_CXXOPTS="-std=c++17"
+          --test_output=errors
+          ortools/... examples/...
diff --git a/ortools/graph/samples/code_samples.bzl b/ortools/graph/samples/code_samples.bzl
index e9da788f2c..daa944e496 100644
--- a/ortools/graph/samples/code_samples.bzl
+++ b/ortools/graph/samples/code_samples.bzl
@@ -26,7 +26,6 @@ def code_sample_cc(name):
             "//ortools/graph:linear_assignment",
             "//ortools/graph:max_flow",
             "//ortools/graph:min_cost_flow",
-            "//ortools/graph:shortestpaths",
         ],
     )
 
@@ -42,7 +41,6 @@ def code_sample_cc(name):
             "//ortools/graph:linear_assignment",
             "//ortools/graph:max_flow",
             "//ortools/graph:min_cost_flow",
-            "//ortools/graph:shortestpaths",
         ],
     )
 
diff --git a/ortools/sat/BUILD.bazel b/ortools/sat/BUILD.bazel
index d04db98693..a7adce7dc9 100644
--- a/ortools/sat/BUILD.bazel
+++ b/ortools/sat/BUILD.bazel
@@ -173,7 +173,7 @@ cc_library(
         ":cp_model_cc_proto",
         ":cp_model_utils",
         ":sat_parameters_cc_proto",
-	":util",
+        ":util",
         "//ortools/base",
         "//ortools/base:hash",
         "//ortools/port:proto_utils",