diff options
| author | nagachika <nagachika@ruby-lang.org> | 2023-09-30 16:18:00 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2023-09-30 16:18:00 +0900 |
| commit | 2d6067dc7d02c5942da6636bba8b1629065aecf0 (patch) | |
| tree | 72a096b9003b8b0de6bd064011b58a949dd8f3d1 | |
| parent | ddbab4f837460f070942e8127de9a9f1b9868fff (diff) | |
merge revision(s) 693e4dec236e14432df97010082917a3a48745cb,8d985b1855d5d5dca88edce32625440a6c123a16,82e480ff40cd41de993b92ddc42ef79a807ff2be,8f1b688177dba412821cbc01ef2cabdce385f7ba:
Prohibit GIT after setting readonly
---
.appveyor.yml | 1 +
1 file changed, 1 insertion(+)
Clarify the actual Visual Studio version [ci skip]
---
.appveyor.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Silent test-all on AppVeyor
---
.appveyor.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Revert vcpkg.exe to previous release [ci skip]
The latest fails to extract downloaded zip files.
---
.appveyor.yml | 1 +
1 file changed, 1 insertion(+)
| -rw-r--r-- | .appveyor.yml | 9 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 6803edff9b..05ff204541 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -26,8 +26,9 @@ environment: # is limited, and compatibility issues that happen only in newer versions are rare. # You may test some other stuff on GitHub Actions instead. - build: vs - vs: 120 + vs: 120 # Visual Studio 2013 ssl: OpenSSL-v111 + # The worker image name. This is NOT the Visual Studio version we're using here. APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GEMS_FOR_TEST: "" RELINE_TEST_ENCODING: "UTF-8" @@ -47,6 +48,7 @@ for: - cd C:\Tools\vcpkg - git pull -q - .\bootstrap-vcpkg.bat + - ps: Start-FileDownload 'https://github.com/microsoft/vcpkg-tool/releases/download/2023-08-09/vcpkg.exe' -FileName 'C:\Tools\vcpkg\vcpkg.exe' - cd %APPVEYOR_BUILD_FOLDER% - vcpkg --triplet %Platform%-windows install --x-use-aria2 libffi libyaml readline zlib - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat @@ -75,6 +77,7 @@ for: - attrib +r /s /d - mkdir %Platform%-mswin_%vs% build_script: + - set HAVE_GIT=no - cd %APPVEYOR_BUILD_FOLDER% - cd %Platform%-mswin_%vs% - >- @@ -91,7 +94,7 @@ for: - nmake -l "TESTOPTS=-v -q" btest - nmake -l "TESTOPTS=-v -q" test-basic - >- - nmake -l "TESTOPTS=-v --timeout-scale=3.0 + nmake -l "TESTOPTS=--timeout-scale=3.0 --excludes=../test/excludes/_appveyor -j%JOBS% --exclude win32ole --exclude test_bignum @@ -102,7 +105,7 @@ for: # separately execute tests without -j which may crash worker with -j. - >- nmake -l - "TESTOPTS=-v --timeout-scale=3.0 --excludes=../test/excludes/_appveyor" + "TESTOPTS=--timeout-scale=3.0 --excludes=../test/excludes/_appveyor" TESTS=" ../test/win32ole ../test/ruby/test_bignum.rb @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 2 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 125 +#define RUBY_PATCHLEVEL 126 #include "ruby/version.h" #include "ruby/internal/abi.h" |