Merge from upstream

.git-blame-ignore-revs

@@ -0,0 +1,10 @@
+# This is a file used by GitHub to ignore the following commits on `git blame`.
+#
+# You can also do the same thing in your local repository with:
+# $ git config --local blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Expand tabs
+5b21e94bebed90180d8ff63dad03b8b948361089
+
+# Enable Style/StringLiterals cop for RubyGems/Bundler
+d7ffd3fea402239b16833cc434404a7af82d44f3

.github/workflows/bundled_gems.yml

@@ -50,6 +50,7 @@ jobs:
 
       - name: Maintain updated gems list in NEWS
         run: |
+          #!ruby
           require 'json'
           news = File.read("NEWS.md")
           prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1]
@@ -100,6 +101,11 @@ jobs:
           make
         if: ${{ steps.diff.outcome == 'failure' }}
 
+      - name: Prepare bundled gems
+        run: |
+          make -s prepare-gems
+        if: ${{ steps.diff.outcome == 'failure' }}
+
       - name: Test bundled gems
         run: |
           make -s test-bundled-gems

.github/workflows/check_misc.yml

@@ -39,6 +39,7 @@ jobs:
 
       - name: Make default gems list
         run: |
+          #!ruby
           require 'rubygems'
           $:.unshift "lib"
           rgver = File.foreach("lib/rubygems.rb") do |line|
@@ -56,6 +57,7 @@ jobs:
 
       - name: Maintain updated gems list in NEWS
         run: |
+          #!ruby
           require 'json'
           news = File.read("NEWS.md")
           prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1]

.github/workflows/compilers.yml

@@ -249,8 +249,6 @@ jobs:
       - run: make test
       - run: make install
         if: ${{ matrix.entry.check }}
-      - run: make prepare-gems
-        if: ${{ matrix.entry.check }}
       - run: make test-tool
         if: ${{ matrix.entry.check }}
       - run: make test-all TESTS='-- ruby -ext-'

.github/workflows/macos.yml

@@ -21,7 +21,6 @@ jobs:
       matrix:
         test_task: ["check"] # "test-bundler-parallel", "test-bundled-gems"
         os:
-          - macos-10.15
           - macos-11
           - macos-12
       fail-fast: false
@@ -56,11 +55,11 @@ jobs:
       - name: Run configure
         run: ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.1) --with-readline-dir=$(brew --prefix readline)
       - run: make incs
+      - run: make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: make
       - run: make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
-      - run: make prepare-gems
-        if: ${{ matrix.test_task == 'check' }}
       - name: make ${{ matrix.test_task }}
         run: |
           make -s ${{ matrix.test_task }} ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`}

.github/workflows/ubuntu.yml

@@ -87,11 +87,11 @@ jobs:
           $SETARCH ../src/configure -C --disable-install-doc ${{ matrix.configure }}
           ${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}
       - run: $SETARCH make incs
+      - run: $SETARCH make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: $SETARCH make
       - run: $SETARCH make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
-      - run: $SETARCH make prepare-gems
-        if: ${{ matrix.test_task == 'check' }}
       - name: Create dummy files in build dir
         run: |
           $SETARCH ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}'

.github/workflows/yjit-ubuntu.yml

@@ -98,11 +98,11 @@ jobs:
       - name: Run configure
         run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
       - run: make incs
+      - run: make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: make -j
       - run: make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
-      - run: make prepare-gems
-        if: ${{ matrix.test_task == 'check' }}
       - name: Create dummy files in build dir
         run: |
           ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}'

.indent.pro

@@ -0,0 +1,32 @@
+-bap
+-nbbb
+-nbc
+-br
+-brs
+-nbs
+-ncdb
+-nce
+-cdw
+-cli2
+-cbi2
+-ndj
+-ncs
+-nfc1
+-i4
+-l120
+-lp
+-npcs
+-psl
+-sc
+-sob
+-sbi4
+-nut
+-par
+
+-TID
+-TVALUE
+-Tst_data_t
+-Tst_index_t
+-Tst_table
+-Trb_data_type_t
+-TFILE

NEWS.md

@@ -175,7 +175,7 @@ Note: We're only listing outstanding class updates.
     * net-imap 0.2.3
     * rbs 2.6.0
     * typeprof 0.21.3
-    * debug 1.5.0
+    * debug 1.6.1
 *   The following default gems are now bundled gems.
 
 ## Compatibility issues