Merge pull request ruby#30 from mmtk/merge-from-upstream

Merge from upstream

Author: wks

.appveyor.yml

@@ -19,15 +19,12 @@ skip_commits:
     - '**/.document'
 environment:
   ruby_version: "24-%Platform%"
-  zlib_version: "1.2.12"
   matrix:
+    # Test only the oldest supported version because AppVeyor is unstable, its concurrency
+    # 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
-      ssl: OpenSSL
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      GEMS_FOR_TEST: ""
-    - build: vs
-      vs: 140
       ssl: OpenSSL-v111
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       GEMS_FOR_TEST: ""
@@ -49,7 +46,7 @@ for:
     - git pull -q
     - .\bootstrap-vcpkg.bat
     - cd %APPVEYOR_BUILD_FOLDER%
-    - vcpkg --triplet %Platform%-windows install libffi libyaml readline zlib
+    - vcpkg --triplet %Platform%-windows install --x-use-aria2 libffi libyaml readline zlib
     - CALL SET vcvars=%%^VS%VS%COMNTOOLS^%%..\..\VC\vcvarsall.bat
     - SET vcvars
     - '"%vcvars%" %Platform:x64=amd64%'
@@ -69,9 +66,6 @@ for:
     - mkdir \usr\local\bin
     - mkdir \usr\local\include
     - mkdir \usr\local\lib
-    - SET ZLIB_ZIP=.downloaded-cache\zlib%zlib_version:.=%.zip
-    - if not exist %ZLIB_ZIP% curl -fsSL -o %ZLIB_ZIP% --retry 10 https://zlib.net/zlib%zlib_version:.=%.zip
-    - 7z x -aos -o%APPVEYOR_BUILD_FOLDER%\ext\zlib %ZLIB_ZIP%
     - for %%I in (%OPENSSL_DIR%\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
     - for %%I in (c:\Tools\vcpkg\installed\%Platform%-windows\bin\*.dll) do (
         if not %%~nI == readline mklink \usr\local\bin\%%~nxI %%I
@@ -124,7 +118,7 @@ notifications:
       {{^isPullRequest}}
         {
           "ci": "AppVeyor CI",
-          "env": "Visual Studio 2013 / 2015",
+          "env": "Visual Studio 2013",
           "url": "{{buildUrl}}",
           "commit": "{{commitId}}",
           "branch": "{{branch}}"

.cirrus.yml

@@ -39,9 +39,8 @@ task:
     # the `make` environment variable used in compilers.yml causes some rubygems
     # tests to fail.
     # https://github.com/rubygems/rubygems/issues/4921
-    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> $CIRRUS_ENV
-  print_env_script:
-    - echo "GNUMAKEFLAGS=$GNUMAKEFLAGS"
+    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> "$CIRRUS_ENV"
+    - cat "$CIRRUS_ENV"
   # Arm containers are executed in AWS's EKS, and it's not yet supporting IPv6
   # See https://github.com/aws/containers-roadmap/issues/835
   disable_ipv6_script: sudo ./tool/disable_ipv6.sh
@@ -99,9 +98,9 @@ yjit_task:
     # the `make` environment variable used in compilers.yml causes some rubygems
     # tests to fail.
     # https://github.com/rubygems/rubygems/issues/4921
-    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> $CIRRUS_ENV
-  print_env_script:
-    - echo "GNUMAKEFLAGS=$GNUMAKEFLAGS"
+    - echo "GNUMAKEFLAGS=-s -j$((1 + $CIRRUS_CPU))" >> "$CIRRUS_ENV"
+    - echo RUST_BACKTRACE=1 >> "$CIRRUS_ENV"
+    - cat "$CIRRUS_ENV"
   # Arm containers are executed in AWS's EKS, and it's not yet supporting IPv6
   # See https://github.com/aws/containers-roadmap/issues/835
   disable_ipv6_script: sudo ./tool/disable_ipv6.sh
@@ -124,9 +123,9 @@ yjit_task:
     else
       echo "only running bindgen on clang image"
     fi
-  boot_miniruby_script: RUST_BACKTRACE=1 ./miniruby --yjit-call-threshold=1 -e0
-  test_dump_insns_script: RUST_BACKTRACE=1 ./miniruby --yjit-call-threshold=1 --yjit-dump-insns -e0
-  output_stats_script: RUST_BACKTRACE=1 ./miniruby --yjit-call-threshold=1 --yjit-stats -e0
+  boot_miniruby_script: ./miniruby --yjit-call-threshold=1 -e0
+  test_dump_insns_script: ./miniruby --yjit-call-threshold=1 --yjit-dump-insns -e0
+  output_stats_script: ./miniruby --yjit-call-threshold=1 --yjit-stats -e0
   full_build_script: source $HOME/.cargo/env && make
   cargo_test_script: source $HOME/.cargo/env && cd yjit && cargo test
   make_test_script: source $HOME/.cargo/env && make test RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"

.github/dependabot.yml

@@ -4,3 +4,6 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
+    ignore:
+      # It doesn't update the version comment for us
+      - dependency-name: 'necojackarc/auto-request-review'

.github/workflows/auto_request_review.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Request review based on files changes and/or groups the author belongs to
-        uses: necojackarc/auto-request-review@e08cdffa277d50854744de3f76230260e61c67f4 # v0.7.0, checking sha
+        uses: necojackarc/auto-request-review@b5e81876454003a4ccb9b89cb205c67d77d7035b # v0.8.0, checking sha
         with:
           # scope: public_repo
           token: ${{ secrets.MATZBOT_GITHUB_TOKEN }}

.github/workflows/baseruby.yml

@@ -6,11 +6,17 @@ on:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
+      - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
+      - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

.github/workflows/bundled_gems.yml

@@ -11,6 +11,7 @@ on:
       - 'gems/bundled_gems'
   schedule:
     - cron: '45 6 * * *'
+  workflow_dispatch:
 
 jobs:
   update:

.github/workflows/check_dependencies.yml

@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

.github/workflows/codeql-analysis.yml

@@ -7,12 +7,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   schedule:
     - cron: '0 12 * * 4'
 
@@ -25,7 +29,8 @@ jobs:
 
     # CodeQL runs on ubuntu-latest and windows-latest
     runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
+    # CodeQL fails to run pull requests from dependabot due to missing write access to upload results.
+    if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') && github.event.head_commit.pusher.name != 'dependabot[bot]' }}
 
     env:
       enable_install_doc: no

.github/workflows/compilers.yml

@@ -7,12 +7,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

.github/workflows/macos.yml

@@ -6,12 +6,16 @@ on:
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
   pull_request:
     paths-ignore:
       - 'doc/**'
       - '**.md'
       - '**.rdoc'
       - '**/.document'
+      - '**.[1-8]'
+      - '**.ronn'
 
 concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}