diff options
| -rw-r--r-- | .appveyor.yml | 28 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 7 |
2 files changed, 30 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 9ebe41e1c8..db444b0c1e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -70,7 +70,11 @@ for: build_script: - cd %APPVEYOR_BUILD_FOLDER% - cd %Platform%-mswin_%vs% - - ..\win32\configure.bat --without-ext=+,dbm,gdbm,readline --with-opt-dir=/usr/local --with-openssl-dir=%OPENSSL_DIR:\=/% + - >- + ..\win32\configure.bat + --without-ext=+,dbm,gdbm,readline + --with-opt-dir=/usr/local + --with-openssl-dir=%OPENSSL_DIR:\=/% - nmake -l - nmake install-nodoc - \usr\bin\ruby -v -e "p :locale => Encoding.find('locale'), :filesystem => Encoding.find('filesystem')" @@ -80,9 +84,27 @@ for: - set /a JOBS=%NUMBER_OF_PROCESSORS% - nmake -l "TESTOPTS=-v -q" btest - nmake -l "TESTOPTS=-v -q" test-basic - - nmake -l "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor -j%JOBS% --exclude readline --exclude win32ole --exclude test_bignum --exclude test_syntax --exclude test_open-uri --exclude test_bundled_ca" test-all + - >- + nmake -l "TESTOPTS=-v --timeout-scale=3.0 + --excludes=../test/excludes/_appveyor -j%JOBS% + --exclude readline + --exclude win32ole + --exclude test_bignum + --exclude test_syntax + --exclude test_open-uri + --exclude test_bundled_ca + " test-all # separately execute tests without -j which may crash worker with -j. - - nmake -l "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor" test-all TESTS="../test/win32ole ../test/ruby/test_bignum.rb ../test/ruby/test_syntax.rb ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb" + - >- + nmake -l + "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor" + TESTS=" + ../test/win32ole + ../test/ruby/test_bignum.rb + ../test/ruby/test_syntax.rb + ../test/open-uri/test_open-uri.rb + ../test/rubygems/test_bundled_ca.rb + " test-all - nmake -l test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows notifications: - provider: Webhook diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 574bfbf474..ebe5a0482f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -98,8 +98,11 @@ jobs: C:\msys64\usr\bin\comm -13 old.env new.env >> %GITHUB_ENV% del *.env - name: Configure - run: | - ../src/win32/configure.bat --disable-install-doc --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows --with-openssl-dir="C:/Program Files/OpenSSL-Win64" + run: >- + ../src/win32/configure.bat --disable-install-doc + --enable-bundled-libffi + --with-opt-dir=C:/vcpkg/installed/x64-windows + --with-openssl-dir="C:/Program Files/OpenSSL-Win64" - run: nmake incs - run: nmake extract-extlibs - run: nmake |