diff --git a/ci/create-artifacts.py b/ci/create-artifacts.py index 2854daa56315..bd5656fd040b 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 diff --git a/ci/install-musl.sh b/ci/install-musl.sh index d43e29470dab..2335eea3fbbd 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)