Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ci/create-artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ def main():
archive_name = f"archive-{now}"
archive_path = f"{archive_name}.tar.gz"

sp.run(["tar", "czvf", archive_path, "-C", build_dir, "-T-"], input=file_list)
sp.run(
["tar", "czvf", archive_path, "-C", build_dir, "-T-"],
input=file_list,
check=True,
)

# If we are in GHA, set these env vars for future use
gh_env = os.getenv("GITHUB_ENV")
Expand All @@ -42,6 +46,7 @@ def main():


if __name__ == "__main__":
print("Starting script...") # For debugging CI failures
# FIXME(ci): remove after the bump to windoes-2025 GHA images
# Python <= 3.9 does not support the very helpful `root_dir` argument,
# and that is the version used by the Windows GHA images. Rather than
Expand All @@ -55,10 +60,12 @@ def main():
sys.exit(1)

# Find the next 3.1x Python version
dirs = sorted(list(Path(r"C:\hostedtoolcache\windows\Python").iterdir()))
dirs = sorted(Path(r"C:\hostedtoolcache\windows\Python").iterdir())
usepy = next(x for x in dirs if r"\3.1" in str(x))
py = usepy.joinpath(r"x64\python.exe")
print(f"relaunching with {py}")
os.execvp(py, [__file__] + sys.argv)

main()
else:
print("not invoked as main, exiting") # For debugging CI failures
6 changes: 4 additions & 2 deletions ci/install-musl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ esac

musl="musl-${musl_version}"

# Download, configure, build, and install musl:
curl --retry 5 "https://www.musl-libc.org/releases/${musl}.tar.gz" | tar xzf -
# Note that if a new version of musl is needed, it needs to be added to the mirror
# first. See https://github.com/rust-lang/ci-mirrors/blob/main/files/libc.toml.
curl --retry 5 "https://ci-mirrors.rust-lang.org/libc/${musl}.tar.gz" | tar xzf -

# Configure, build, and install musl:
cd "$musl"
case ${1} in
aarch64)
Expand Down
Loading