Skip to content

Commit

Permalink
Merge pull request MaterializeInc#9437 from benesch/build-breakage
Browse files Browse the repository at this point in the history
Various CI and build bugfixes
  • Loading branch information
benesch authored Dec 6, 2021
2 parents 1d51a74 + f87d775 commit 037d948
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
1 change: 1 addition & 0 deletions ci/deploy/linux.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def main() -> None:
publish_multiarch_images("latest", deps)
else:
publish_multiarch_images("unstable", deps)
publish_multiarch_images(f'unstable-{git.rev_parse("HEAD")}', deps)

print("--- Uploading binary tarball")
for repo in repos:
Expand Down
4 changes: 4 additions & 0 deletions demo/chbench/mysql/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ FROM mysql/mysql-server:8.0.27

COPY mysql.cnf /etc/mysql/conf.d/
COPY replication.sql /docker-entrypoint-initdb.d/

# The caching_sha2_password plugin requires the Python `cryptography` package
# on the client, which is a somewhat onerous dependency.
CMD ["mysqld", "--default-authentication-plugin=mysql_native_password"]
12 changes: 9 additions & 3 deletions misc/python/materialize/mzbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,10 @@ def build(self) -> None:
# down CI, since we're packaging these binaries up into Docker
# images and shipping them around. A bit unfortunate, since it'd be
# nice to have useful backtraces if the binary crashes.
spawn.runv([*self.rd.tool("strip"), "--strip-debug", self.path / self.bin])
spawn.runv(
[*self.rd.tool("strip"), "--strip-debug", self.path / self.bin],
cwd=self.rd.root,
)
else:
# Even if we've been asked not to strip the binary, remove the
# `.debug_pubnames` and `.debug_pubtypes` sections. These are just
Expand All @@ -267,11 +270,14 @@ def build(self) -> None:
"-R",
".debug_pubtypes",
self.path / self.bin,
]
],
cwd=self.rd.root,
)
if self.extract:
output = spawn.capture(
cargo_build + ["--message-format=json"], unicode=True
cargo_build + ["--message-format=json"],
unicode=True,
cwd=self.rd.root,
)
for line in output.split("\n"):
if line.strip() == "" or not line.startswith("{"):
Expand Down

0 comments on commit 037d948

Please sign in to comment.