Merge branch 'master' into mmtk

.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"
@@ -92,8 +93,8 @@ for:
     - 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%
+      nmake -l "TESTOPTS=--timeout-scale=3.0
+      --excludes=../test/.excludes/_appveyor -j%JOBS%
       --exclude win32ole
       --exclude test_bignum
       --exclude test_syntax
@@ -103,15 +104,15 @@ 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
       ../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
+    - nmake -l test-spec # not using `-j` because sometimes `mspec -j` silently dies on Windows
 notifications:
   - provider: Webhook
     method: POST

.gdbinit

@@ -689,11 +689,6 @@ define nd_stts
 end
 
 
-define nd_entry
-  printf "%su3.entry%s: ", $color_highlite, $color_end
-  p ($arg0).u3.entry
-end
-
 define nd_vid
   printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id

.github/actions/setup/directories/action.yml

@@ -93,7 +93,7 @@ runs:
       working-directory: ${{ inputs.srcdir }}
       run: |
         touch config.status
-        touch rbconfig.time
+        touch .rbconfig.time
         sed -f tool/prereq.status template/Makefile.in common.mk > Makefile
         make up
 

.github/actions/setup/macos/action.yml

@@ -13,7 +13,6 @@ runs:
     - name: brew
       shell: bash
       run: |
-        brew upgrade --quiet
         brew install --quiet gmp libffi [email protected] zlib autoconf automake libtool readline
 
     - name: Set ENV

.github/workflows/macos.yml

@@ -80,7 +80,7 @@ jobs:
       - name: make ${{ matrix.test_task }}
         run: |
           make -s ${{ matrix.test_task }} ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`}
-        timeout-minutes: 40
+        timeout-minutes: 60
         env:
           RUBY_TESTOPTS: '-q --tty=no'
           TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}

.github/workflows/mingw.yml

@@ -78,9 +78,9 @@ jobs:
           mv /c/Windows/System32/libssl-1_1-x64.dll    /c/Windows/System32/libssl-1_1-x64.dll_
           result=true
           for e in gcc.exe ragel.exe make.exe libcrypto-1_1-x64.dll libssl-1_1-x64.dll; do
-            echo '##['group']'$'\033[93m'$e$'\033[m'
+            echo ::group::$'\033[93m'$e$'\033[m'
             where $e || result=false
-            echo '##['endgroup']'
+            echo ::endgroup::
           done
           $result
         working-directory:
@@ -91,9 +91,9 @@ jobs:
           result=true
           for e in gcc ragel make "openssl version"; do
             case "$e" in *" "*) ;; *) e="$e --version";; esac
-            echo '##['group']'$'\033[93m'$e$'\033[m'
+            echo ::group::$'\033[93m'$e$'\033[m'
             $e || result=false
-            echo '##['endgroup']'
+            echo ::endgroup::
           done
           $result
         working-directory:

.github/workflows/windows.yml

@@ -129,8 +129,10 @@ jobs:
           :vcset
           set | C:\msys64\usr\bin\sort > old.env
           call %VCVARS%
+          nmake -f nul
           set TMP=%USERPROFILE%\AppData\Local\Temp
           set TEMP=%USERPROFILE%\AppData\Local\Temp
+          set MAKEFLAGS=l
           set /a TEST_JOBS=(15 * %NUMBER_OF_PROCESSORS% / 10) > nul
           set | C:\msys64\usr\bin\sort > new.env
           C:\msys64\usr\bin\comm -13 old.env new.env >> %GITHUB_ENV%
@@ -162,7 +164,7 @@ jobs:
       - run: nmake test
         timeout-minutes: 5
 
-      - run: nmake test-spec MSPECOPT="-V -fspec"
+      - run: nmake test-spec
         timeout-minutes: 10
 
       - run: nmake test-all

.github/workflows/yjit-ubuntu.yml

@@ -157,7 +157,7 @@ jobs:
         run: ./miniruby --yjit -v | grep "+YJIT"
 
       - name: make ${{ matrix.test_task }}
-        run: make -s -j ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS" YJIT_BENCH_OPTS="$YJIT_BENCH_OPTS"
+        run: make -s -j ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS" YJIT_BENCH_OPTS="$YJIT_BENCH_OPTS" YJIT_BINDGEN_DIFF_OPTS="$YJIT_BINDGEN_DIFF_OPTS"
         timeout-minutes: 60
         env:
           RUBY_TESTOPTS: '-q --tty=no'

.gitignore

@@ -254,3 +254,13 @@ lcov*.info
 
 # /wasm/
 /wasm/tests/*.wasm
+
+# YARP
+/lib/yarp/node.rb
+/lib/yarp/serialize.rb
+/yarp/api_node.c
+/yarp/ast.h
+/yarp/node.c
+/yarp/prettyprint.c
+/yarp/serialize.c
+/yarp/token_type.c

.travis.yml

@@ -209,7 +209,7 @@ script:
     if [ -n "${TEST_ALL_OPTS_SEPARATED}" ]; then
       $SETARCH make -s test-all -o exts TESTOPTS="$JOBS -v --tty=no ${TEST_ALL_OPTS_SEPARATED}" RUBYOPT="-w" || :
     fi
-  - $SETARCH make -s test-spec MSPECOPT=-ff # not using `-j` because sometimes `mspec -j` silently dies
+  - $SETARCH make -s test-spec # not using `-j` because sometimes `mspec -j` silently dies
   - $SETARCH make -s -o showflags leaked-globals
 
 # We enable Travis on the specific branches or forked repositories here.

NEWS.md

@@ -69,26 +69,28 @@ The following default gems are updated.
 * bigdecimal 3.1.4
 * bundler 2.5.0.dev
 * csv 3.2.8
+* erb 4.0.3
 * fiddle 1.1.2
 * fileutils 1.7.1
 * irb 1.7.4
 * nkf 0.1.3
 * optparse 0.4.0.pre.1
 * psych 5.1.0
-* reline 0.3.7
+* reline 0.3.8
 * stringio 3.0.8
 * strscan 3.0.7
 * syntax_suggest 1.1.0
 * time 0.2.2
 * timeout 0.4.0
 * uri 0.12.2
-* yarp 0.4.0
+* yarp 0.8.0
 
 The following bundled gems are updated.
 
 * minitest 5.19.0
 * test-unit 3.6.1
 * rexml 3.2.6
+* rss 0.3.0
 * net-imap 0.3.7
 * rbs 3.1.3
 * typeprof 0.21.7