https://git.ruby-lang.org/ruby.git/commit/?id=b31a707396

From b31a707396718c344ca9b50e28edc08b2bae20d1 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Fri, 21 Oct 2022 22:38:01 +0900
Subject: merge revision(s) 7ce3a100f2aef897ee1062dcda23b70cd5574866:

	Fold command line items

	---
	 .appveyor.yml                 | 28 +++++++++++++++++++++++++---
	 .github/workflows/windows.yml |  7 +++++--
	 2 files changed, 30 insertions(+), 5 deletions(-)
---
 .appveyor.yml                 | 28 +++++++++++++++++++++++++---
 .github/workflows/windows.yml |  7 +++++--
 version.h                     |  2 +-
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4ab2fc50d1..f3f77ebee0 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -70,7 +70,11 @@ for: https://github.com/ruby/ruby/blob/trunk/.appveyor.yml#L70
   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: https://github.com/ruby/ruby/blob/trunk/.appveyor.yml#L84
     - 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: https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L98
           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
diff --git a/version.h b/version.h
index f67ca3de88..6e8c14d64f 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 155
+#define RUBY_PATCHLEVEL 156
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-- 
cgit v1.2.3


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/