Cleanup dazel

.github/workflows/build_and_test.yml

@@ -33,20 +33,17 @@ jobs:
         include:
           - os: macos-latest
             sudo-command: "sudo"
-            # Explicitly not using `dazel` here as we don't want to
-            # build/test on Linux but on macOS!
             bazel-command: "bazelisk"
             bazel-config: ""
             output-user_root: ""
           - os: ubuntu-latest
             sudo-command: "sudo"
-            bazel-command: "dazel"
-            bazel-config: "--config=asan --test_env=ASAN_OPTIONS=detect_odr_violation=0"
+            bazel-command: "bazelisk"
+            # TODO(onelxj): Turn on address sanitizer.
+            bazel-config: "--test_env=ASAN_OPTIONS=detect_odr_violation=0"
             output-user_root: ""
           - os: windows-2019
             sudo-command: "" # The Windows runner already runs as root.
-            # Explicitly not using `dazel` here as we don't want to
-            # build/test on Linux but on Windows!
             bazel-command: "bazelisk"
             bazel-config: ""
             # Fixes issue #248.
@@ -84,19 +81,6 @@ jobs:
         if: ${{ matrix.os == 'windows-2019' }}
         run: ${{ matrix.sudo-command }} pip3 install wheel
 
-      # Install Dazel for use on Linux so that we use the same build
-      # tooling in our Actions as we do on our workstations.
-      - name: Install Dazel
-        if: ${{ matrix.bazel-command == 'dazel' }}
-        run: ${{ matrix.sudo-command }} pip3 install dazel
-
-      # Invoke 'dazel version' in order to build the Docker container
-      # as a separate step so we can track how long it takes and
-      # optimize as necessary.
-      - name: Dazel Docker Build
-        if: ${{ matrix.bazel-command == 'dazel' }}
-        run: dazel version
-
       # With the exception of GITHUB_TOKEN, secrets are not passed to the runner
       # when a workflow is triggered from a forked repository, and thus we
       # can only set up a remote cache if this pull request comes from a
@@ -113,25 +97,14 @@ jobs:
           ${{ matrix.bazel-command }} \
             ${{ matrix.output-user_root }} \
             build \
+            ${{ matrix.bazel-config }} \
             ${{ env.BAZEL_REMOTE_CACHE }} \
+            --verbose_failures \
+            -c dbg \
             --strip="never" \
             ...
 
       - name: Test
-        run: |
-          ${{ matrix.bazel-command }} \
-            ${{ matrix.output-user_root }} \
-            test \
-            --experimental_ui_max_stdouterr_bytes=-1 \
-            ${{ env.BAZEL_REMOTE_CACHE }} \
-            --strip="never" \
-            --test_output=errors \
-            test/... \
-            --test_arg=--gtest_shuffle \
-            --test_arg=--gtest_repeat=100
-
-      - name: Debug failure logs
-        if: ${{ failure() && github.event_name == 'workflow_dispatch' }}
         run: |
           ${{ matrix.bazel-command }} \
             ${{ matrix.output-user_root }} \
@@ -143,7 +116,9 @@ jobs:
             -c dbg \
             --strip="never" \
             --test_output=errors \
-            test/...
+            test/... \
+            --test_arg=--gtest_shuffle \
+            --test_arg=--gtest_repeat=100
 
       - name: Debug using tmate (if failure)
         uses: mxschmitt/action-tmate@v3

.gitignore

@@ -4,9 +4,6 @@
 user.bazelrc
 *~
 
-# Runtime file for Dazel.
-.dazel_run
-
 # Files inside submodules. This is moot for git itself, since it knows that
 # these are submodules and that any file inside a submodule should be treated
 # as being in a separate repo (with its own .gitignore) but it is useful for

.mergequeue/config.yml

@@ -14,7 +14,7 @@ merge_rules:
     number_of_approvals: 1
     required_checks:
       - check_code_style (ubuntu-latest)
-      - Build and Test (ubuntu-latest, sudo, dazel, --config=asan)
+      - Build and Test (ubuntu-latest, sudo, bazelisk, --test_env=ASAN_OPTIONS=detect_odr_violation=0)
       - Build and Test (macos-latest, sudo, bazelisk)
     use_github_mergeability: false
     conversation_resolution_required: true

eventuals/then.h

@@ -112,7 +112,6 @@ struct _Then final {
           "callable passed to 'Then' is not invocable "
           "with the type of argument it receives");
 
-
       return Continuation<K, F_, Arg>(std::move(k), std::move(f_));
     }