Skip to content

Commit d6c9928

Browse files
authored
Fix thirdparty builds failing (#297)
The clockbound dependency is currently pointed at `main` instead of a fixed version or commit hash, resulting in thirdparty builds breaking when upstream repo is updated. This PR binds to specific clockbound commit (there are no version tags on the upstream repo). Also update URL for boost, which has changed: boostorg/boost#843 (comment) Fixes #296
1 parent e037b77 commit d6c9928

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

python/build_definitions/boost.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ def __init__(self) -> None:
4646
super(BoostDependency, self).__init__(
4747
name='boost',
4848
version=self.VERSION_STR,
49-
# URL grabbed from https://www.boost.org/users/history/version_1_77_0.html
50-
url_pattern='https://boostorg.jfrog.io/artifactory/main/release/{}/source/'
49+
url_pattern='https://archives.boost.io/release/{}/source/'
5150
'boost_{}.tar.bz2'.format(self.VERSION_STR, self.VERSION_STR_UNDERSCORES),
5251
build_group=BuildGroup.POTENTIALLY_INSTRUMENTED,
5352
license='Boost Software License 1.0')

python/build_definitions/clockbound.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ClockBoundDependency(Dependency):
3333
def __init__(self) -> None:
3434
super(ClockBoundDependency, self).__init__(
3535
name='clockbound',
36-
version='main',
36+
version='26c05dcbd0f8adb41c5000c279f53659a476f2b3',
3737
url_pattern='https://github.com/aws/clock-bound/archive/{0}.zip',
3838
build_group=BuildGroup.COMMON)
3939

thirdparty_src_checksums.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854 boost-1.77.0.t
1212
1e42551a7bf986be92d937a18be7208d38c5420550813b170969b08f1cb79058 cassandra-cpp-driver-2.9.0-yb-14.tar.gz
1313
e97dc472aae52197a4d5e0185eb8f9e04d7575d2dc2b12194ddc768e0f8a846d cfe-7.1.0.tar.xz
1414
1ce0042c48ecea839ce67b87e9739cf18e7a5c2b3b9a36d177d00979609b6451 clang-tools-extra-7.1.0.tar.xz
15+
dd7f3c1c2d22d1b4e1ae733619921c8f5ab8e0ff76b4326b08e3c11a135c486f clockbound-26c05dcbd0f8adb41c5000c279f53659a476f2b3.zip
1516
057bdac0581215b5ceb39edfd5bbef9eb79578f16a8908349f3066251fba88d8 compiler-rt-7.1.0.tar.xz
1617
ffbfee231d45655dd99b55e40d0c42dbb7b653f584a760054cef6fe90cf84f0b cqlsh-3.10-yb-11.tar.gz
1718
5b2a2a81bcde9ebd129b0cff611933aec10cb36f78eda8d5ee775a6975c71316 cqlsh-3.10-yb-12.tar.gz
@@ -145,4 +146,3 @@ c31b4485b453e69d42318bbee0b8aec3276911ccb17fb02a96667247faccb67d tcmalloc-e116a
145146
6ffa3116b89e82cd5039595c9526f79c0dfa10614e3b339bd7250e94f24b6d38 yb-llvm-v13.0.0-yb-1-1639976983-4b60e646-centos8-aarch64.tar.gz
146147
9a46ac80ab1e92718261ae540ff84ed6c02ebd1280e0c176fc9989b596faca28 zlib-1.2.12-yb-1.tar.gz
147148
734672243aa416d7284216307e9b87cec570e9d7c211a7939678e5c238a772e9 zlib-1.2.13-yb-1.tar.gz
148-
5360d006d85cb1dc5674ad64f0ee65cd739ac7f0bf7f3264eda8adb21f097a5c clockbound-main.zip

0 commit comments

Comments
 (0)