simplified

ffalconu · May 22, 2020 · c1a8bb2 · c1a8bb2
1 parent 49f59c6
commit c1a8bb2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.appveyor-build-tag.yml b/.appveyor-build-tag.yml
@@ -16,9 +16,9 @@ init:
 
 install:
   - set PATH=C:\Python38-x64;C:\Python38-x64\Scripts;C:\msys64\usr\bin;%PATH%
-  - ps: Start-FileDownload 'http://repo.msys2.org/msys/x86_64/pacman-5.2.1-6-x86_64.pkg.tar.xz'
-  - pacman -U --noconfirm pacman-5.2.1-6-x86_64.pkg.tar.xz
-  - del pacman-5.2.1-6-x86_64.pkg.tar.xz
+  # The following line is needed to work around a bug in MSYS2 pacman, it should be removed when fixed.
+  # See: https://github.com/msys2/MSYS2-packages/issues/1967
+  - pacman -U --noconfirm pacman --noconfirm -U http://repo.msys2.org/msys/x86_64/pacman-5.2.1-6-x86_64.pkg.tar.xz
   - pacman --noconfirm --ask 20 --sync --refresh --refresh --sysupgrade --sysupgrade
   - pacman --noconfirm -Syuu
   - echo export WEBOTS_HOME="%APPVEYOR_BUILD_FOLDER%" >> C:\msys64\home\appveyor\.bash_profile

diff --git a/.appveyor-build.yml b/.appveyor-build.yml
@@ -14,6 +14,9 @@ init:
 
 install:
   - set PATH=C:\Python38-x64;C:\Python38-x64\Scripts;C:\msys64\usr\bin;%PATH%
+  # The following line is needed to work around a bug in MSYS2 pacman, it should be removed when fixed.
+  # See: https://github.com/msys2/MSYS2-packages/issues/1967
+  - pacman -U --noconfirm pacman --noconfirm -U http://repo.msys2.org/msys/x86_64/pacman-5.2.1-6-x86_64.pkg.tar.xz
   - pacman --noconfirm --ask 20 --sync --refresh --refresh --sysupgrade --sysupgrade
   - pacman --noconfirm -Syuu
   - echo export WEBOTS_HOME="%APPVEYOR_BUILD_FOLDER%" >> C:\msys64\home\appveyor\.bash_profile

diff --git a/.appveyor-test-sources-scheduled.yml b/.appveyor-test-sources-scheduled.yml
@@ -4,6 +4,9 @@ clone_depth: 1
 
 install:
   - set PATH=C:\Python38-x64;C:\Python38-x64\Scripts;C:\msys64\usr\bin;C:\msys64\mingw64\bin;%PATH%
+  # The following line is needed to work around a bug in MSYS2 pacman, it should be removed when fixed.
+  # See: https://github.com/msys2/MSYS2-packages/issues/1967
+  - pacman -U --noconfirm pacman --noconfirm -U http://repo.msys2.org/msys/x86_64/pacman-5.2.1-6-x86_64.pkg.tar.xz
   - pacman --noconfirm --ask 20 --sync --refresh --refresh --sysupgrade --sysupgrade
   - pacman --noconfirm -Syuu
   - pacman --noconfirm -S mingw-w64-x86_64-cppcheck