warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Add ci/install.bat

Browse Source 
Move the MinGW package installation commands from ci/build.sh into
ci/install.sh.
This commit is contained in:
Bart Van Assche
2022-11-08 16:29:12 -08:00
parent 505b2a0ab4
commit 3fe06e8563
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.appveyor.yml
View File

@@ -10,6 +10,7 @@ clone_depth: 5
install:
- sh: 'ci/install.sh'
- cmd: 'ci\install.bat'
build_script:
- sh: 'ci/build.sh'

9
ci/build.sh
View File

@@ -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)
;;

1
ci/install.bat Normal file
View File

@@ -0,0 +1 @@
C:\msys64\usr\bin\bash --login -c 'set -x; cd "${APPVEYOR_BUILD_FOLDER}"; ci/install.sh'

11
ci/install.sh
View File

@@ -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