diff --git a/.appveyor.yml b/.appveyor.yml index 6a0cbda..406d178 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,7 +9,8 @@ image: clone_depth: 5 install: - - sh: 'ci/install.sh' + - sh: 'ci/install.sh' + - cmd: 'ci\install.bat' build_script: - sh: 'ci/build.sh' diff --git a/ci/build.sh b/ci/build.sh index edda709..6d71bfd 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -9,15 +9,6 @@ configure_options=( case "$(uname)" in MSYS*|MINGW*) - pacman --noconfirm --remove mingw-w64-x86_64-gcc-ada - pacman --noconfirm --remove mingw-w64-x86_64-gcc-fortran - pacman --noconfirm --remove mingw-w64-x86_64-gcc-libgfortran - pacman --noconfirm --remove mingw-w64-x86_64-gcc-objc - pacman --noconfirm --sync --refresh - pacman --noconfirm --sync --needed diffutils - pacman --noconfirm --sync --needed make - pacman --noconfirm --sync --needed mingw-w64-x86_64-gcc - pacman --noconfirm --sync --needed mingw-w64-x86_64-cunit export PATH="/mingw64/bin:$PATH" configure_options+=(--disable-shared) ;; diff --git a/ci/install.bat b/ci/install.bat new file mode 100644 index 0000000..9848922 --- /dev/null +++ b/ci/install.bat @@ -0,0 +1 @@ +C:\msys64\usr\bin\bash --login -c 'set -x; cd "${APPVEYOR_BUILD_FOLDER}"; ci/install.sh' diff --git a/ci/install.sh b/ci/install.sh index a354e17..528881f 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -14,4 +14,15 @@ case "$(uname)" in ;; Darwin) ;; + MSYS*|MINGW*) + pacman --noconfirm --remove mingw-w64-x86_64-gcc-ada + pacman --noconfirm --remove mingw-w64-x86_64-gcc-fortran + pacman --noconfirm --remove mingw-w64-x86_64-gcc-libgfortran + pacman --noconfirm --remove mingw-w64-x86_64-gcc-objc + pacman --noconfirm --sync --refresh + pacman --noconfirm --sync --needed diffutils + pacman --noconfirm --sync --needed make + pacman --noconfirm --sync --needed mingw-w64-x86_64-gcc + pacman --noconfirm --sync --needed mingw-w64-x86_64-cunit + ;; esac