Skip to content

Commit

Permalink
Merge pull request google#1865 from xlsynth:cdleary/2025-01-16-fix-do…
Browse files Browse the repository at this point in the history
…cker-build

PiperOrigin-RevId: 716837915
  • Loading branch information
copybara-github committed Jan 18, 2025
2 parents 583de45 + b16872e commit 2cc0793
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
restore-keys: bazel-cache-nightly-${{ runner.os }}-

- name: Install dependencies via apt
run: sudo apt-get install python3-distutils python3-dev python-is-python3 libtinfo5 build-essential liblapack-dev libblas-dev gfortran
run: sudo apt-get install python3-dev python-is-python3 build-essential liblapack-dev libblas-dev gfortran

- name: Bazel Build Tools (opt)
run: |
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile-ubuntu-22.04
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN chmod +x bazelisk-linux-amd64 && mv bazelisk-linux-amd64 /usr/bin/bazel


# Install dependencies
RUN apt-get -y install python3-distutils python3-dev python-is-python3 libtinfo5 build-essential libxml2-dev liblapack-dev libblas-dev gfortran
RUN apt-get -y install python3-distutils python3-dev python-is-python3 libtinfo5 build-essential libxml2-dev liblapack-dev libblas-dev gfortran zip

# Install development tools
RUN apt-get install -y git vim
Expand All @@ -36,6 +36,6 @@ ADD --chown=xls-developer . /home/xls-developer/xls/
WORKDIR /home/xls-developer/xls/


# Test everything (opt), exclude xlscc for now due to increased build time when
# we add Clang.
RUN bazel test -c opt -- //xls/... -//xls/contrib/xlscc/...
# Test everything (opt), exclude contrib (including xlscc) for now due to
# increased build time when we add Clang.
RUN bazel test -c opt --test_summary=terse --test_verbose_timeout_warnings -- //xls/... -//xls/contrib/... -//xls/dev_tools/...

0 comments on commit 2cc0793

Please sign in to comment.