From 6f753dd61024dc967256bb46f16a1c5a226782b0 Mon Sep 17 00:00:00 2001 From: Alan Morris Date: Sun, 18 Feb 2024 14:11:43 -0700 Subject: [PATCH] Changed URL for windows rsync --- .github/workflows/copy_artifact.sh | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/copy_artifact.sh b/.github/workflows/copy_artifact.sh index b646d21bde..9b6e8458d9 100755 --- a/.github/workflows/copy_artifact.sh +++ b/.github/workflows/copy_artifact.sh @@ -14,18 +14,16 @@ if [[ "$PLATFORM" == "windows" ]]; then # install rsync on for windows/msys2 (the one from chocolatey doesn't work) # (adapted from https://github.com/GuillaumeFalourd/setup-rsync) echo "Installing rsync for Windows/msys2" - curl.exe --output rsync-3.2.3-2-x86_64.pkg.tar.zst --url https://repo.msys2.org/msys/x86_64/rsync-3.2.3-1-x86_64.pkg.tar.zst - zstd -d rsync-3.2.3-2-x86_64.pkg.tar.zst - tar -xvf rsync-3.2.3-2-x86_64.pkg.tar - mv usr/bin/rsync.exe "C:\Program Files\Git\usr\bin\\" - curl.exe --output libzstd-1.5.2-1-x86_64.pkg.tar.zst https://repo.msys2.org/msys/x86_64/libzstd-1.5.2-1-x86_64.pkg.tar.zst - zstd -d libzstd-1.5.2-1-x86_64.pkg.tar.zst - tar -xvf libzstd-1.5.2-1-x86_64.pkg.tar - mv usr/bin/msys-zstd-1.dll "C:\Program Files\Git\usr\bin\\" - curl.exe --output libxxhash-0.8.0-1-x86_64.pkg.tar.zst https://repo.msys2.org/msys/x86_64/libxxhash-0.8.1-1-x86_64.pkg.tar.zst - zstd -d libxxhash-0.8.0-1-x86_64.pkg.tar.zst - tar -xvf libxxhash-0.8.0-1-x86_64.pkg.tar - mv usr/bin/msys-xxhash-0.8.0.dll "C:\Program Files\Git\usr\bin\\" + + # These were the original URLs, but they keep changing and it's time consuming to keep up + # So I have just combined them in this windows_rsync.tar.gz that I'm hosting myself + + # https://repo.msys2.org/msys/x86_64/rsync-3.2.3-1-x86_64.pkg.tar.zst + # https://repo.msys2.org/msys/x86_64/libzstd-1.5.2-1-x86_64.pkg.tar.zst + # https://repo.msys2.org/msys/x86_64/libxxhash-0.8.1-1-x86_64.pkg.tar.zst + curl.exe --output windows_rsync.tar.gz http://www.sci.utah.edu/~amorris/windows_rsync.tar.gz + + mv usr/bin/* "C:\Program Files\Git\usr\bin\\" echo "rsync installed on windows runner" fi