cirrus/msys2: Cache msys2 mingw in a better way.
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20210107101919.80-3-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/.cirrus.yml b/.cirrus.yml
index 68b8a8f..bc40a05 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -64,23 +64,61 @@
CIRRUS_SHELL: powershell
MSYS: winsymlinks:nativestrict
MSYSTEM: MINGW64
+ MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-01-05/msys2-base-x86_64-20210105.sfx.exe
+ MSYS2_FINGERPRINT: 0
+ MSYS2_PACKAGES: "
+ diffutils git grep make pkg-config sed
+ mingw-w64-x86_64-python
+ mingw-w64-x86_64-python-sphinx
+ mingw-w64-x86_64-toolchain
+ mingw-w64-x86_64-SDL2
+ mingw-w64-x86_64-SDL2_image
+ mingw-w64-x86_64-gtk3
+ mingw-w64-x86_64-glib2
+ mingw-w64-x86_64-ninja
+ mingw-w64-x86_64-jemalloc
+ mingw-w64-x86_64-lzo2
+ mingw-w64-x86_64-zstd
+ mingw-w64-x86_64-libjpeg-turbo
+ mingw-w64-x86_64-pixman
+ mingw-w64-x86_64-libgcrypt
+ mingw-w64-x86_64-libpng
+ mingw-w64-x86_64-libssh
+ mingw-w64-x86_64-libxml2
+ mingw-w64-x86_64-snappy
+ mingw-w64-x86_64-libusb
+ mingw-w64-x86_64-usbredir
+ mingw-w64-x86_64-libtasn1
+ mingw-w64-x86_64-nettle
+ mingw-w64-x86_64-cyrus-sasl
+ mingw-w64-x86_64-curl
+ mingw-w64-x86_64-gnutls
+ mingw-w64-x86_64-libnfs
+ "
CHERE_INVOKING: 1
- setup_script:
- - choco install -y --no-progress 7zip
- - Write-Output $env:PATH
msys2_cache:
folder: C:\tools\archive
reupload_on_changes: false
- fingerprint_script: cat .cirrus.yml
+ # These env variables are used to generate fingerprint to trigger the cache procedure
+ # If wanna to force re-populate msys2, increase MSYS2_FINGERPRINT
+ fingerprint_script:
+ - |
+ echo $env:CIRRUS_TASK_NAME
+ echo $env:MSYS2_URL
+ echo $env:MSYS2_FINGERPRINT
+ echo $env:MSYS2_PACKAGES
populate_script:
- |
- md C:\tools
- md C:\tools\archive
+ md -Force C:\tools\archive\pkg
$start_time = Get-Date
+ bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND $env:MSYS2_URL C:\tools\archive\base.exe
+ Write-Output "Download time taken: $((Get-Date).Subtract($start_time))"
cd C:\tools
- bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND https://github.com/msys2/msys2-installer/releases/download/2020-09-03/msys2-base-x86_64-20200903.sfx.exe C:\tools\base.exe
- Write-Output "Download time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)"
- C:\tools\base.exe -y
+ C:\tools\archive\base.exe -y
+ del -Force C:\tools\archive\base.exe
+ Write-Output "Base install time taken: $((Get-Date).Subtract($start_time))"
+ $start_time = Get-Date
+
((Get-Content -path C:\tools\msys64\etc\\post-install\\07-pacman-key.post -Raw) -replace '--refresh-keys', '--version') | Set-Content -Path C:\tools\msys64\etc\\post-install\\07-pacman-key.post
C:\tools\msys64\usr\bin\bash.exe -lc "sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf"
C:\tools\msys64\usr\bin\bash.exe -lc "export"
@@ -90,49 +128,30 @@
tasklist
C:\tools\msys64\usr\bin\bash.exe -lc "mv -f /etc/pacman.conf.pacnew /etc/pacman.conf || true"
C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Suu --overwrite=*"
- C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \
- diffutils git grep make pkg-config sed \
- mingw-w64-x86_64-python \
- mingw-w64-x86_64-toolchain \
- mingw-w64-x86_64-SDL2 \
- mingw-w64-x86_64-SDL2_image \
- mingw-w64-x86_64-gtk3 \
- mingw-w64-x86_64-glib2 \
- mingw-w64-x86_64-ninja \
- mingw-w64-x86_64-jemalloc \
- mingw-w64-x86_64-lzo2 \
- mingw-w64-x86_64-zstd \
- mingw-w64-x86_64-libjpeg-turbo \
- mingw-w64-x86_64-pixman \
- mingw-w64-x86_64-libgcrypt \
- mingw-w64-x86_64-libpng \
- mingw-w64-x86_64-libssh \
- mingw-w64-x86_64-libxml2 \
- mingw-w64-x86_64-snappy \
- mingw-w64-x86_64-libusb \
- mingw-w64-x86_64-usbredir \
- mingw-w64-x86_64-libtasn1 \
- mingw-w64-x86_64-nettle \
- mingw-w64-x86_64-cyrus-sasl \
- mingw-w64-x86_64-curl \
- mingw-w64-x86_64-gnutls \
- mingw-w64-x86_64-libnfs \
- "
- bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND `
- https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz `
- C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
- C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -U /c/tools/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz"
- del C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
- C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf /var/cache/pacman/pkg/*"
- cd C:\tools\msys64
- echo "Start archive"
- cmd /C "7z a -ttar . -so | 7z a -txz -simsys2-x86_64.tar C:\tools\archive\msys2-x86_64.tar.xz"
+ Write-Output "Core install time taken: $((Get-Date).Subtract($start_time))"
+ $start_time = Get-Date
+
+ C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed $env:MSYS2_PACKAGES"
+ Write-Output "Package install time taken: $((Get-Date).Subtract($start_time))"
+ $start_time = Get-Date
+
+ del -Force -ErrorAction SilentlyContinue C:\tools\msys64\etc\mtab
+ del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\fd
+ del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stderr
+ del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdin
+ del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdout
+ del -Force -Recurse -ErrorAction SilentlyContinue C:\tools\msys64\var\cache\pacman\pkg
+ tar cf C:\tools\archive\msys64.tar -C C:\tools\ msys64
+
+ Write-Output "Package archive time taken: $((Get-Date).Subtract($start_time))"
+ del -Force -Recurse -ErrorAction SilentlyContinue c:\tools\msys64
install_script:
- |
+ $start_time = Get-Date
cd C:\tools
- cmd /C "7z x C:\tools\archive\msys2-x86_64.tar.xz -so | 7z x -aoa -simsys2-x86_64.tar -ttar -omsys64"
- C:\tools\msys64\usr\bin\bash.exe -lc "export"
-
+ ls C:\tools\archive\msys64.tar
+ tar xf C:\tools\archive\msys64.tar
+ Write-Output "Extract msys2 time taken: $((Get-Date).Subtract($start_time))"
script:
- C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build"
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --python=python3"
