From 4620d7c4981ebc71a1c08f2cea6253a0f4fc2c07 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Mon, 3 Nov 2025 21:15:45 -0600 Subject: [PATCH 1/2] ci: Check process output in create-artifacts Add `check=True` to catch nonzero exit codes, and address one other lint for unneeded collection to `list`. Additionally, add some print statements in an attempt to help debug the CI failure on Windows. (backport ) (cherry picked from commit 83bd32f8ac10bf20bba9509b06de5f242ca7c6ad) --- ci/create-artifacts.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ci/create-artifacts.py b/ci/create-artifacts.py index 2854daa563154..bd5656fd040b2 100755 --- a/ci/create-artifacts.py +++ b/ci/create-artifacts.py @@ -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") @@ -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 @@ -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 From bc6768979248eda2507ca896a35e09de72b4c8c9 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Wed, 5 Nov 2025 15:45:49 -0600 Subject: [PATCH 2/2] ci: Use a mirror for musl downloads The musl server has been a bit flaky, so the files we needed have been added to rust-lang mirrors. Update CI setup here to make use of them. Link: https://github.com/rust-lang/ci-mirrors/blob/15a6d341341e858c2b7be872a47a39f546cc6759/files/libc.toml (backport ) (cherry picked from commit 7c9757722c623dc87ce0f1f3bce34f1c8d93fe41) --- ci/install-musl.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/install-musl.sh b/ci/install-musl.sh index d43e29470dabd..2335eea3fbbda 100755 --- a/ci/install-musl.sh +++ b/ci/install-musl.sh @@ -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)