Skip to content

Commit

Permalink
Remove dazel run from tests
Browse files Browse the repository at this point in the history
  • Loading branch information
onelxj committed Sep 1, 2023
1 parent fa959e4 commit 161ee03
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 118 deletions.
6 changes: 6 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ build --enable_platform_specific_config
# Verbose failure logs when something goes wrong.
build --verbose_failures

# By default run both (target) compilation mode and host compilation
# mode in 'fastbuild' so that any "tools" that get build (which are
# built for the host) don't require building things a second time.
build --compilation_mode=fastbuild
build --host_compilation_mode=fastbuild

# Build with clang (rather than the default of gcc) since clang compiles
# templates faster and produces better error messages.
# Prefer repo_env over action_env to avoid invalidating the action graph:
Expand Down
23 changes: 0 additions & 23 deletions .dazelrc

This file was deleted.

34 changes: 7 additions & 27 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,20 @@ on:
jobs:
build-and-test:
name: Build and Test
runs-on: ${{ matrix.os }}
runs-on: ${{ matrix.runner }}
strategy:
matrix:
include:
- os: macos-latest
- runner: 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
- runner: 64_core_GitHub_hosted
sudo-command: "sudo"
bazel-command: "dazel"
bazel-config: "--config=asan"
bazel-config: "--config=asan --test_env=ASAN_OPTIONS=detect_odr_violation=0"
output-user_root: ""
- os: windows-2019
- runner: 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.
output-user_root: "--output_user_root=C:/bzl"
Expand Down Expand Up @@ -84,19 +77,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
Expand All @@ -110,7 +90,7 @@ jobs:
- name: Build
run: |
${{ matrix.bazel-command }} \
bazelisk \
${{ matrix.output-user_root }} \
build \
${{ matrix.bazel-config }} \
Expand All @@ -122,7 +102,7 @@ jobs:
- name: Test
run: |
${{ matrix.bazel-command }} \
bazelisk \
${{ matrix.output-user_root }} \
test \
${{ matrix.bazel-config }} \
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .mergequeue/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ 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 (macos-latest, sudo, bazelisk)
- Build and Test (ubuntu-latest, 64_core_GitHub_hosted, sudo, --config=asan --test_env=ASAN_OPTIONS=detect_odr_violation=0)
- Build and Test (macos-latest, macos-latest, sudo, bazelisk)
use_github_mergeability: false
conversation_resolution_required: true
merge_mode:
Expand Down
63 changes: 0 additions & 63 deletions Dockerfile.dazel

This file was deleted.

0 comments on commit 161ee03

Please sign in to comment.