Skip to content

Commit

Permalink
Fix boost import (#69)
Browse files Browse the repository at this point in the history
* Fix boost import

Since very recently, builds using this repo have started failing with
errors due to the Boost dependency:
```
ERROR: /home/vscode/.cache/bazel/_bazel_vscode/e9b5149ef40c40531841044f5a70254d/external/com_github_3rdparty_stout/BUILD.bazel:62:11: @com_github_3rdparty_stout//:stout depends on @boost//:variant in repository @boost which failed to fetch. no such package '@boost//': java.io.IOException: Error downloading [https://boostorg.jfrog.io/artifactory/main/release/1.79.0/source/boost_1_79_0.tar.gz] to /home/vscode/.cache/bazel/_bazel_vscode/e9b5149ef40c40531841044f5a70254d/external/boost/temp13387589294389186013/boost_1_79_0.tar.gz: Checksum was 5e89103d9b70bba5c91a794126b169cb67654be2051f90cf7c22ba6893ede0ff but wanted 273f1be93238a068aba4f9735a4a2b003019af067b9c183ed227780b8f36062c
```

We fix this error by upgrading to a newer version of the Boost repo. We
can't go beyond nelhage/rules_boost#319 since it
breaks our Windows support; see: nelhage/rules_boost#535

While we're here, also add a `.bazeliskrc`, which is important to have
this repo work with our modern Codespaces.

* Also fix MergeQueue config's windows check entry
  • Loading branch information
rjhuijsman authored Jan 8, 2024
1 parent d2d7a6a commit 7ae903c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .bazeliskrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
USE_BAZEL_VERSION=5.4.1
2 changes: 1 addition & 1 deletion .mergequeue/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ merge_rules:
number_of_approvals: 1
required_checks:
- check_code_style (ubuntu-latest)
- Build and Test (windows-latest)
- Build and Test (windows-2019)
- Build and Test (ubuntu-latest)
- Build and Test (macos-latest)
use_github_mergeability: false
Expand Down
4 changes: 2 additions & 2 deletions bazel/repos.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ def repos(external = True, repo_mapping = {}):
maybe(
git_repository,
name = "com_github_nelhage_rules_boost",
commit = "32164a62e2472077320f48f52b8077207cd0c9c8",
commit = "494ddf5db56580eb019479965fa2908ce6548385",
remote = "https://github.com/nelhage/rules_boost",
shallow_since = "1650381330 -0700",
shallow_since = "1675669198 -0800",
)

maybe(
Expand Down

0 comments on commit 7ae903c

Please sign in to comment.