diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-09-04 02:19:39 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-09-04 02:19:39 +0000 |
| commit | e4b1172833afd680105bc067a4db0942273df53a (patch) | |
| tree | 4b852965001d0b6ea5c53d164c994570bf516c71 /appveyor.yml | |
| parent | 2cbf44e55b2e7d8d9db48b67602a3935932a2aab (diff) | |
| download | ruby-e4b1172833afd680105bc067a4db0942273df53a.tar.gz | |
appveyor.yml: fix PATH and env for msys2
based on the patch by MSP-Greg at #1945.
Co-authored-by: MSP-Greg <greg.mpls@gmail.com>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/appveyor.yml b/appveyor.yml index 74b361c4b1..beecf57219 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -105,36 +105,31 @@ for: - SET MSYSTEM=%MSYSTEM:x=MINGW% - SET MSYS2_ARCH=%Platform:x86=i686% - SET MSYS2_ARCH=%MSYS2_ARCH:x64=x86_64% + - set MSYSTEM_PREFIX=/mingw64 + - set MINGW_CHOST=%MSYS2_ARCH%-w64-mingw32 - SET ruby_path=C:\Ruby%ruby_version:-x86=% - - SET PATH=\usr\local\bin;%ruby_path%\bin;%PATH%;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin + - cd .. + - mkdir build + - mkdir install + - SET PATH=%ruby_path%\bin;C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH% - ruby --version - - mkdir \usr\bin - - mkdir \usr\share - - mkdir \usr\local\bin - - mkdir \usr\local\include - - mkdir \usr\local\lib build_script: + # always update database + - pacman -Sy + - pacman -S --noconfirm --needed --noprogressbar mingw-w64-x86_64-toolchain + - pacman -S --noconfirm --needed --noprogressbar mingw-w64-x86_64-gdbm mingw-w64-x86_64-gmp mingw-w64-x86_64-libffi mingw-w64-x86_64-ncurses mingw-w64-x86_64-readline mingw-w64-x86_64-zlib - cd %APPVEYOR_BUILD_FOLDER% - - pacman --noconfirm --sync --refresh --refresh pacman - - pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade - - pacman --noconfirm -S --needed base-devel mingw-w64-x86_64-gdbm - - sh -c "ln -s $(which autom4te) /usr/bin/autom4te" - # mklink \usr\bin\autom4te c:\msys64\usr\bin\autom4te - - sh -c "ln -s $(which m4) /usr/bin/m4" - # mklink \usr\bin\m4.exe c:\msys64\usr\bin\m4.exe - - sh -c "ln -s /c/msys64/usr/share/autoconf /usr/share/autoconf" - # mklink /d \usr\share\autoconf c:\msys64\usr\share\autoconf - - sh -c autoconf - - sh configure --disable-install-doc --prefix=/usr/local - - sh -c "ln -sf $(which mingw32-make) /c/msys64/usr/bin/make.exe" - # del c:\msys64\usr\bin\make.exe - # mklink c:\msys64\usr\bin\make.exe mingw32-make.exe - - dir c:\usr\bin - - dir c:\usr\share - - dir c:\msys64\usr\bin\make.exe + - set CFLAGS=-march=%MSYS2_ARCH:_=-% -mtune=generic -O3 -pipe + - set CXXFLAGS=%CFLAGS% + - set CPPFLAGS=-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048 + - set LDFLAGS=-pipe + - sh -c "autoreconf -fi" + - cd ..\build + - sh ../ruby/configure --disable-install-doc --prefix=/. --build=%MINGW_CHOST% --host=%MINGW_CHOST% --target=%MINGW_CHOST% + - mingw32-make -j%JOBS% up - mingw32-make -j%JOBS% - - mingw32-make -j%JOBS% install" + - mingw32-make DESTDIR=../install install-nodoc test_script: - mingw32-make test - - mingw32-make -j%JOBS% test-all RUBY_FORCE_TEST_JIT=1 V=1 - - mingw32-make -j%JOBS% test-spec MSPECOPT=-j + - mingw32-make test-all TESTOPTS="-j %JOBS% --retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5" RUBY_FORCE_TEST_JIT=1 V=1 + - mingw32-make test-spec MSPECOPT=-j |