Skip to content

Commit 30acaf9

Browse files
craig[bot]rickystewartknz
committed
107128: c-deps: update archived c-deps to pick up cockroachdb#106929 r=rail,RaduBerinde a=rickystewart Epic: none Release note (build): On Linux/ARM64, use 16k page sizes in `jemalloc` Part of: cockroachdb#106745 107178: Revert "github-pull-request-make: temporary workaround" r=healthy-pod a=knz Epic: CRDB-18499 This reverts commit da33ea2. Not needed any more since is merged now. Co-authored-by: Ricky Stewart <[email protected]> Co-authored-by: Raphael 'kena' Poss <[email protected]>
3 parents ab8fac2 + 64b6310 + 9d96bb6 commit 30acaf9

File tree

4 files changed

+33
-38
lines changed

4 files changed

+33
-38
lines changed

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,22 +1165,22 @@ DISTDIR_FILES = {
11651165
"https://storage.googleapis.com/public-bazel-artifacts/bazel/rules_proto-b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d",
11661166
"https://storage.googleapis.com/public-bazel-artifacts/bazel/rules_python-0.1.0.tar.gz": "b6d46438523a3ec0f3cead544190ee13223a52f6a6765a29eae7b7cc24cc83a0",
11671167
"https://storage.googleapis.com/public-bazel-artifacts/bazel/sqllogictest-96138842571462ed9a697bff590828d8f6356a2f.tar.gz": "f7e0d659fbefb65f32d4c5d146cba4c73c43e0e96f9b217a756c82be17451f97",
1168-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libgeos_foreign.linux.20230713-184622.tar.gz": "41742e88359d55a8d45207e5628e28cd7ea7689b804bbb6ea5950e26bc7da070",
1169-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libgeos_foreign.linuxarm.20230713-184622.tar.gz": "93d19ab0c8506c0d00284e0e393ff8703a0bbf7ed3103f242e29ffdef20bbdd8",
1170-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libgeos_foreign.macos.20230713-184622.tar.gz": "3fa2c5a668a097cc6ff75ed6b8ff7c2a67364f9f73fbd7f930dcbc880dcf398d",
1171-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libgeos_foreign.macosarm.20230713-184622.tar.gz": "0eccaa5745f0228bb4be02ef20970078861a3652ef6ff91b436f44dd7fbc7f65",
1172-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libjemalloc_foreign.linux.20230713-184622.tar.gz": "9bac2dd86a77e47b2891649cfe8b14f8885ccd7d08ab1283eca7889bba65a576",
1173-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libjemalloc_foreign.linuxarm.20230713-184622.tar.gz": "124c29566233005309becd58c5deaa80c1d961a9fb18bba0807865f8f1ee07af",
1174-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libjemalloc_foreign.macos.20230713-184622.tar.gz": "aad0b1ec36d37d5f91d22936eff0d0676a35bb5cb140949a9b85d734df64ed78",
1175-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libjemalloc_foreign.macosarm.20230713-184622.tar.gz": "4494582bd2909440124ed46d5fb84142742706c5edc968ee3ff6be0f62b4e2ad",
1176-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libjemalloc_foreign.windows.20230713-184622.tar.gz": "cab948999d3f16e820fe1c58b85164718903b6a55a3634edf6564645b057ee71",
1177-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libkrb5_foreign.linux.20230713-184622.tar.gz": "fcc88b98b93109c70edf2180f969e2164c9c25bdffcebc647116b47b80114863",
1178-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libkrb5_foreign.linuxarm.20230713-184622.tar.gz": "1fd3e8a24ee8345986f705c7bae9977a3c574c43a62f17025959d041081a1678",
1179-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libproj_foreign.linux.20230713-184622.tar.gz": "a36e373c04817f322dc1482a192a0911a41855ccc30f0c356e76133db4333aa4",
1180-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libproj_foreign.linuxarm.20230713-184622.tar.gz": "b97df26615a592434f782bcd4f5faacbbb4f939da78004e447764b66a445d942",
1181-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libproj_foreign.macos.20230713-184622.tar.gz": "3235279411c84fa03e5b19ac8b28756dabf54535ea67a98c0e44f73197e20bea",
1182-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libproj_foreign.macosarm.20230713-184622.tar.gz": "eb8830c18b5d906d9951934ae9b8e2bf99e2d4d0d74897dff6dd4f35c50aef54",
1183-
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230713-184622/libproj_foreign.windows.20230713-184622.tar.gz": "ca1335c8182a2562ea43e0803d4ca437d45fb95462896752219f19cb302814eb",
1168+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libgeos_foreign.linux.20230718-202534.tar.gz": "7ad99432a0c09380604c3c55ce422649024818db92a9912d8e223e30001b15ac",
1169+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libgeos_foreign.linuxarm.20230718-202534.tar.gz": "80402249a2007bfbba8db82ba1bdc510d4ff12bf643f72fb8a9bcadf8274d9b1",
1170+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libgeos_foreign.macos.20230718-202534.tar.gz": "66e25c31359736feee9481edd9f8c46446b4521fea0408c83c531067c572018a",
1171+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libgeos_foreign.macosarm.20230718-202534.tar.gz": "564cd09a59cf6eeb83eb151d483679024195f780780ad546c3fb3a9c564d72b3",
1172+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libjemalloc_foreign.linux.20230718-202534.tar.gz": "7364c749452e4d62bc12b75669e971cbab3acacde791851b8e9aa1f80ab6a5f3",
1173+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libjemalloc_foreign.linuxarm.20230718-202534.tar.gz": "b8872435726f170748acabb0c1b56c5dd65205a056c99b5c525db36cf7c64bd1",
1174+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libjemalloc_foreign.macos.20230718-202534.tar.gz": "7bb49812e427360826fad1c8727317d01c56383c2e973b67fbda04ee81b6c361",
1175+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libjemalloc_foreign.macosarm.20230718-202534.tar.gz": "fc0abd2c6c4feb38cd17963c6b2594053e764ce23757958a25acb9db2c44d2db",
1176+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libjemalloc_foreign.windows.20230718-202534.tar.gz": "358ae921815ba1c795694bf3cf36f81125c0cb69f732ea05ebfb93204b3ddd8b",
1177+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libkrb5_foreign.linux.20230718-202534.tar.gz": "c80aef627ef24036fddd26c18600e4be594678c6b9935a930f8dba7fbdc9fce3",
1178+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libkrb5_foreign.linuxarm.20230718-202534.tar.gz": "7350a695a316a8618db9323ab609ec5604123f2249e345193c625da8987d1e5e",
1179+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libproj_foreign.linux.20230718-202534.tar.gz": "b00fcaea77c8e42a34fa18d0dda4211db01e9f27f402685c60265abd000d3ff5",
1180+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libproj_foreign.linuxarm.20230718-202534.tar.gz": "96e72cc4871f9a5265deacef93243ad281ad1ef94805788a6696d6c978eba1db",
1181+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libproj_foreign.macos.20230718-202534.tar.gz": "96771a33542beb72067afcafaeb790134014e56798fa4cbe291894c4ebf8b68d",
1182+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libproj_foreign.macosarm.20230718-202534.tar.gz": "b2c60ffe1f50c6e81ba906f773b95d3a6699538d57e71749579552f4211a1e3e",
1183+
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20230718-202534/libproj_foreign.windows.20230718-202534.tar.gz": "16de1e76ee8de4bd144dc57bfde05385d086943ca1b64cc246055c8b0cd71c65",
11841184
"https://storage.googleapis.com/public-bazel-artifacts/go/20230614-165357/go1.19.10.darwin-amd64.tar.gz": "48361d76271f9a725942bdc17012ae9fef72359f7b0aa303deb1098e05ef818c",
11851185
"https://storage.googleapis.com/public-bazel-artifacts/go/20230614-165357/go1.19.10.darwin-arm64.tar.gz": "7cc8ab7e8e1225b57f44ec8fb26bce70ddea8e076dfdf118ed63fef0c9ff19fb",
11861186
"https://storage.googleapis.com/public-bazel-artifacts/go/20230614-165357/go1.19.10.freebsd-amd64.tar.gz": "0d22265662eaa9b8136223f8ab68f5c06c58c6a6311748fb810e830ebd17cbe2",

‎c-deps/REPOSITORIES.bzl‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,80 +39,80 @@ def c_deps():
3939
archived_cdep_repository(
4040
lib = "libgeos",
4141
config = "linux",
42-
sha256 = "41742e88359d55a8d45207e5628e28cd7ea7689b804bbb6ea5950e26bc7da070",
42+
sha256 = "7ad99432a0c09380604c3c55ce422649024818db92a9912d8e223e30001b15ac",
4343
)
4444
archived_cdep_repository(
4545
lib = "libjemalloc",
4646
config = "linux",
47-
sha256 = "9bac2dd86a77e47b2891649cfe8b14f8885ccd7d08ab1283eca7889bba65a576",
47+
sha256 = "7364c749452e4d62bc12b75669e971cbab3acacde791851b8e9aa1f80ab6a5f3",
4848
)
4949
archived_cdep_repository(
5050
lib = "libkrb5",
5151
config = "linux",
52-
sha256 = "fcc88b98b93109c70edf2180f969e2164c9c25bdffcebc647116b47b80114863",
52+
sha256 = "c80aef627ef24036fddd26c18600e4be594678c6b9935a930f8dba7fbdc9fce3",
5353
)
5454
archived_cdep_repository(
5555
lib = "libproj",
5656
config = "linux",
57-
sha256 = "a36e373c04817f322dc1482a192a0911a41855ccc30f0c356e76133db4333aa4",
57+
sha256 = "b00fcaea77c8e42a34fa18d0dda4211db01e9f27f402685c60265abd000d3ff5",
5858
)
5959
archived_cdep_repository(
6060
lib = "libgeos",
6161
config = "linuxarm",
62-
sha256 = "93d19ab0c8506c0d00284e0e393ff8703a0bbf7ed3103f242e29ffdef20bbdd8",
62+
sha256 = "80402249a2007bfbba8db82ba1bdc510d4ff12bf643f72fb8a9bcadf8274d9b1",
6363
)
6464
archived_cdep_repository(
6565
lib = "libjemalloc",
6666
config = "linuxarm",
67-
sha256 = "124c29566233005309becd58c5deaa80c1d961a9fb18bba0807865f8f1ee07af",
67+
sha256 = "b8872435726f170748acabb0c1b56c5dd65205a056c99b5c525db36cf7c64bd1",
6868
)
6969
archived_cdep_repository(
7070
lib = "libkrb5",
7171
config = "linuxarm",
72-
sha256 = "1fd3e8a24ee8345986f705c7bae9977a3c574c43a62f17025959d041081a1678",
72+
sha256 = "7350a695a316a8618db9323ab609ec5604123f2249e345193c625da8987d1e5e",
7373
)
7474
archived_cdep_repository(
7575
lib = "libproj",
7676
config = "linuxarm",
77-
sha256 = "b97df26615a592434f782bcd4f5faacbbb4f939da78004e447764b66a445d942",
77+
sha256 = "96e72cc4871f9a5265deacef93243ad281ad1ef94805788a6696d6c978eba1db",
7878
)
7979
archived_cdep_repository(
8080
lib = "libgeos",
8181
config = "macos",
82-
sha256 = "3fa2c5a668a097cc6ff75ed6b8ff7c2a67364f9f73fbd7f930dcbc880dcf398d",
82+
sha256 = "66e25c31359736feee9481edd9f8c46446b4521fea0408c83c531067c572018a",
8383
)
8484
archived_cdep_repository(
8585
lib = "libjemalloc",
8686
config = "macos",
87-
sha256 = "aad0b1ec36d37d5f91d22936eff0d0676a35bb5cb140949a9b85d734df64ed78",
87+
sha256 = "7bb49812e427360826fad1c8727317d01c56383c2e973b67fbda04ee81b6c361",
8888
)
8989
archived_cdep_repository(
9090
lib = "libproj",
9191
config = "macos",
92-
sha256 = "3235279411c84fa03e5b19ac8b28756dabf54535ea67a98c0e44f73197e20bea",
92+
sha256 = "96771a33542beb72067afcafaeb790134014e56798fa4cbe291894c4ebf8b68d",
9393
)
9494
archived_cdep_repository(
9595
lib = "libgeos",
9696
config = "macosarm",
97-
sha256 = "0eccaa5745f0228bb4be02ef20970078861a3652ef6ff91b436f44dd7fbc7f65",
97+
sha256 = "564cd09a59cf6eeb83eb151d483679024195f780780ad546c3fb3a9c564d72b3",
9898
)
9999
archived_cdep_repository(
100100
lib = "libjemalloc",
101101
config = "macosarm",
102-
sha256 = "4494582bd2909440124ed46d5fb84142742706c5edc968ee3ff6be0f62b4e2ad",
102+
sha256 = "fc0abd2c6c4feb38cd17963c6b2594053e764ce23757958a25acb9db2c44d2db",
103103
)
104104
archived_cdep_repository(
105105
lib = "libproj",
106106
config = "macosarm",
107-
sha256 = "eb8830c18b5d906d9951934ae9b8e2bf99e2d4d0d74897dff6dd4f35c50aef54",
107+
sha256 = "b2c60ffe1f50c6e81ba906f773b95d3a6699538d57e71749579552f4211a1e3e",
108108
)
109109
archived_cdep_repository(
110110
lib = "libjemalloc",
111111
config = "windows",
112-
sha256 = "cab948999d3f16e820fe1c58b85164718903b6a55a3634edf6564645b057ee71",
112+
sha256 = "358ae921815ba1c795694bf3cf36f81125c0cb69f732ea05ebfb93204b3ddd8b",
113113
)
114114
archived_cdep_repository(
115115
lib = "libproj",
116116
config = "windows",
117-
sha256 = "ca1335c8182a2562ea43e0803d4ca437d45fb95462896752219f19cb302814eb",
117+
sha256 = "16de1e76ee8de4bd144dc57bfde05385d086943ca1b64cc246055c8b0cd71c65",
118118
)

‎c-deps/archived.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
44

55
# NB: URL_TMPL and LOC are used by generate-distdir. Don't change the format or
66
# name of these definitions unless you update generate-distdir accordingly.
7-
LOC = "20230713-184622"
7+
LOC = "20230718-202534"
88
URL_TMPL = "https://storage.googleapis.com/public-bazel-artifacts/c-deps/{loc}/{lib}_foreign.{config}.{loc}.tar.gz"
99

1010
# NB: When we link with the krb5 libraries, we want the linker to see them in

‎pkg/cmd/github-pull-request-make/main.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,6 @@ func main() {
209209

210210
if len(pkgs) > 0 {
211211
for name, pkg := range pkgs {
212-
// [knz] Temporary hack to get #106928 over the finish line.
213-
if strings.HasPrefix(name, "pkg/server") {
214-
continue
215-
}
216-
217212
// 20 minutes total seems OK, but at least 2 minutes per test.
218213
// This should be reduced. See #46941.
219214
duration := (20 * time.Minute) / time.Duration(len(pkgs))

0 commit comments

Comments
 (0)