Merge ruby-build v20230330

* commit 'refs/rbtags/v20230330':
  ruby-build 20230330
  Avoid shellcheck CI job commenting on every PR
  Upgrade from OpenSSL 3.0 to OpenSSL 3.1
  Add definitions for Ruby 2.7.8, 3.0.6, 3.1.4, 3.2.2 (#2174)
  Remove AWS access key ID from version control (#2163)
  ruby-build 20230309
  Add JRuby 9.4.2.0
  ruby-build 20230306
  appease linter
  add stub_repeated test helper
  automatically detect and use Homebrew's libyaml
  Add mruby-3.2.0
  ruby-build 20230222
  Update truffleruby+graalvm-dev builds to use the latest Java LTS build as a base.
  Update truffleruby-dev to use builds based on Ubuntu 20.04.
  Remove brew update instruction (#2151)
  release script: handle multiple releases on the same day
  ruby-build 20230208.1
  Add Ruby 3.2.1
  http://topazruby.com/ is 404 now
  ruby-build 20230208
  bump openssl version to 1.1.1t
  bump openssl version to 3.0.8
  Update sha2 for JRuby 1.7.2
  Removed definitions that are already removed from official site
  Use the current JRuby download url
  Bump redhat-plumbers-in-action/differential-shellcheck from 3 to 4
  Bump mislav/bump-homebrew-formula-action from 1 to 2
  Bump actions/checkout from 2 to 3
  Added dependabot update for GitHub Actions
  Remove patch for openssl-1.1.1q
  Add JRuby 9.4.1.0
  ruby-build 20230202
  Add JRuby 9.3.10.0
  graalvm-ce-dev-builds are now using JDK 19

Author: jasonkarns

README.md

@@ -47,7 +47,7 @@ brew install node-build
 
 Upgrade with:
 ```sh
-brew update && brew upgrade node-build
+brew upgrade node-build
 ```
 
 ### Clone as nodenv plugin using git

bin/nodenv-install

@@ -244,7 +244,7 @@ if [ "$STATUS" == "2" ]; then
     echo -n "If the version you need is missing, try upgrading node-build"
     if [ "$here" != "${here#$(brew --prefix 2>/dev/null)}" ]; then
       printf ":\\n\\n"
-      echo "  brew update && brew upgrade node-build"
+      echo "  brew upgrade node-build"
     elif [ -d "${here}/.git" ]; then
       printf ":\\n\\n"
       echo "  git -C ${here} pull"

test/build.bats

@@ -60,7 +60,8 @@ assert_build_log() {
 @test "apply node patch before building" {
   cached_tarball "node-v4.0.0"
 
-  stub brew false
+  stub_repeated uname '-s : echo Linux'
+  stub_repeated brew false
   stub_make_install
   stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log'
 
@@ -71,6 +72,8 @@ diff -pU3 align.c align.c
 PATCH
   assert_success
 
+  unstub uname
+  unstub brew
   unstub make
   unstub patch
 
@@ -85,7 +88,8 @@ OUT
 @test "striplevel node patch before building" {
   cached_tarball "node-v4.0.0"
 
-  stub brew false
+  stub_repeated uname '-s : echo Linux'
+  stub_repeated brew false
   stub_make_install
   stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log'
 
@@ -96,6 +100,8 @@ diff -pU3 a/configure b/configure
 PATCH
   assert_success
 
+  unstub uname
+  unstub brew
   unstub make
   unstub patch
 
@@ -110,7 +116,8 @@ OUT
 @test "apply node patch from git diff before building" {
   cached_tarball "node-v4.0.0"
 
-  stub brew false
+  stub_repeated uname '-s : echo Linux'
+  stub_repeated brew false
   stub_make_install
   stub patch ' : echo patch "$@" | sed -E "s/\.[[:alnum:]]+$/.XXX/" >> build.log'
 
@@ -122,6 +129,8 @@ index 4760c31..66a237a 100755
 PATCH
   assert_success
 
+  unstub uname
+  unstub brew
   unstub make
   unstub patch
 
@@ -136,7 +145,7 @@ OUT
 @test "number of CPU cores defaults to 2" {
   cached_tarball "node-v4.0.0"
 
-  stub uname '-s : echo Darwin'
+  stub_repeated uname '-s : echo Darwin'
   stub sysctl false
   stub_make_install
 
@@ -159,7 +168,7 @@ OUT
 @test "number of CPU cores is detected on Mac" {
   cached_tarball "node-v4.0.0"
 
-  stub uname '-s : echo Darwin'
+  stub_repeated uname '-s : echo Darwin'
   stub sysctl '-n hw.ncpu : echo 4'
   stub_make_install
 
@@ -183,7 +192,7 @@ OUT
 @test "number of CPU cores is detected on FreeBSD" {
   cached_tarball "node-v4.0.0"
 
-  stub uname '-s : echo FreeBSD'
+  stub_repeated uname '-s : echo FreeBSD'
   stub sysctl '-n hw.ncpu : echo 1'
   stub_make_install
 
@@ -207,6 +216,7 @@ OUT
 @test "setting NODE_MAKE_INSTALL_OPTS to a multi-word string" {
   cached_tarball "node-v4.0.0"
 
+  stub_repeated uname '-s : echo Linux'
   stub_make_install
 
   export NODE_MAKE_INSTALL_OPTS="DOGE=\"such wow\""
@@ -227,6 +237,7 @@ OUT
 @test "setting MAKE_INSTALL_OPTS to a multi-word string" {
   cached_tarball "node-v4.0.0"
 
+  stub_repeated uname '-s : echo Linux'
   stub_make_install
 
   export MAKE_INSTALL_OPTS="DOGE=\"such wow\""
@@ -256,7 +267,7 @@ OUT
 @test "make on FreeBSD defaults to gmake" {
   cached_tarball "node-v4.0.0"
 
-  stub uname "-s : echo FreeBSD"
+  stub_repeated uname "-s : echo FreeBSD"
   MAKE=gmake stub_make_install
 
   MAKE= install_fixture definitions/vanilla-node
@@ -275,6 +286,7 @@ apply -p1 -i /my/patch.diff
 exec ./configure "\$@"
 CONF
 
+  stub_repeated uname '-s : echo Linux'
   stub apply 'echo apply "$@" >> build.log'
   stub_make_install
 

test/compiler.bats

@@ -7,17 +7,66 @@ export -n CFLAGS
 export -n CC
 export -n NODE_CONFIGURE_OPTS
 
+@test "require_gcc on OS X 10.9" {
+  stub_repeated uname '-s : echo Darwin'
+  stub sw_vers '-productVersion : echo 10.9.5'
+  stub_repeated gcc '--version : echo 4.2.1'
+
+  run_inline_definition <<DEF
+require_gcc
+echo CC=\$CC
+echo MACOSX_DEPLOYMENT_TARGET=\${MACOSX_DEPLOYMENT_TARGET-no}
+DEF
+  assert_success
+  assert_output <<OUT
+CC=${TMP}/bin/gcc
+MACOSX_DEPLOYMENT_TARGET=no
+OUT
+
+  unstub uname
+  unstub sw_vers
+  unstub gcc
+}
+
+@test "require_gcc on OS X 10.10" {
+  stub_repeated uname '-s : echo Darwin'
+  stub sw_vers '-productVersion : echo 10.10'
+  stub_repeated gcc '--version : echo 4.2.1'
+
+  run_inline_definition <<DEF
+require_gcc
+echo CC=\$CC
+echo MACOSX_DEPLOYMENT_TARGET=\${MACOSX_DEPLOYMENT_TARGET-no}
+DEF
+  assert_success
+  assert_output <<OUT
+CC=${TMP}/bin/gcc
+MACOSX_DEPLOYMENT_TARGET=10.9
+OUT
+
+  unstub uname
+  unstub sw_vers
+  unstub gcc
+}
+
+@test "require_gcc silences warnings" {
+  stub gcc '--version : echo warning >&2; echo 4.2.1' '--version : echo warning >&2; echo 4.2.1'
+
+  run_inline_definition <<DEF
+require_gcc
+echo \$CC
+DEF
+  assert_success "${TMP}/bin/gcc"
+}
+
 @test "CC=clang by default on OS X 10.10" {
   mkdir -p "$INSTALL_ROOT"
   cd "$INSTALL_ROOT"
 
-  stub uname '-s : echo Darwin' '-s : echo Darwin'
+  stub_repeated uname '-s : echo Darwin'
   stub sw_vers '-productVersion : echo 10.10'
-  stub cc 'false'
-  stub brew 'false'
-  stub make \
-    'echo make $@' \
-    'echo make $@'
+  stub_repeated brew 'false'
+  stub_repeated make 'echo make $@'
 
   cat > ./configure <<CON
 #!${BASH}
@@ -40,4 +89,9 @@ CFLAGS=no
 make -j 2
 make install
 OUT
+
+  unstub uname
+  unstub sw_vers
+  unstub brew
+  unstub make
 }

test/nodenv.bats

@@ -82,7 +82,7 @@ OUT
 }
 
 @test "nonexistent version" {
-  stub brew false
+  stub_repeated brew false
   stub_node_build 'echo ERROR >&2 && exit 2' \
     "--definitions : echo 0.8.7 0.10.4 0.10.6 1.0.0 4.1.2 | tr ' ' $'\\n'"
 
@@ -102,6 +102,7 @@ If the version you need is missing, try upgrading node-build:
   git -C ${BATS_TEST_DIRNAME}/.. pull
 OUT
 
+  unstub brew
   unstub node-build
 }
 
@@ -119,7 +120,7 @@ See all available versions with \`nodenv install --list'.
 
 If the version you need is missing, try upgrading node-build:
 
-  brew update && brew upgrade node-build
+  brew upgrade node-build
 OUT
 
   unstub brew

test/stubs/stub

@@ -1,14 +1,15 @@
 #!/usr/bin/env bash
 set -e
 
-status=0
+status=127
 program="${0##*/}"
 PROGRAM="$(echo "$program" | tr a-z- A-Z_)"
 [ -n "$TMPDIR" ] || TMPDIR="/tmp"
 
 _STUB_PLAN="${PROGRAM}_STUB_PLAN"
 _STUB_RUN="${PROGRAM}_STUB_RUN"
 _STUB_INDEX="${PROGRAM}_STUB_INDEX"
+_STUB_NOINDEX="${PROGRAM}_STUB_NOINDEX"
 _STUB_RESULT="${PROGRAM}_STUB_RESULT"
 _STUB_END="${PROGRAM}_STUB_END"
 _STUB_DEBUG="${PROGRAM}_STUB_DEBUG"
@@ -32,7 +33,7 @@ index=0
 while IFS= read -r line; do
   index=$(($index + 1))
 
-  if [ -z "${!_STUB_END}" ] && [ $index -eq "${!_STUB_INDEX}" ]; then
+  if [[ -z "${!_STUB_END}" && -n "${!_STUB_NOINDEX}" || $index -eq "${!_STUB_INDEX}" ]]; then
     # We found the plan line we're interested in.
     # Start off by assuming success.
     result=0
@@ -72,7 +73,8 @@ while IFS= read -r line; do
       ( eval "$command" )
       status="$?"
       set -e
-    else
+      [ -z "${!_STUB_NOINDEX}" ] || break
+    elif [ -z "${!_STUB_NOINDEX}" ]; then
       eval "${_STUB_RESULT}"=1
     fi
   fi
@@ -95,7 +97,7 @@ if [ -n "${!_STUB_END}" ]; then
 else
   # If the requested index is larger than the number
   # of lines in the plan file, we failed.
-  if [ "${!_STUB_INDEX}" -gt $index ]; then
+  if [[ -z "${!_STUB_NOINDEX}" && "${!_STUB_INDEX}" -gt $index ]]; then
     eval "${_STUB_RESULT}"=1
   fi
 

test/test_helper.bash

@@ -41,6 +41,14 @@ teardown() {
   rm -fr "${BATS_TMPDIR:?}"/*
 }
 
+stub_repeated() {
+  local program="$1"
+  # shellcheck disable=SC2155
+  local prefix="$(echo "$program" | tr a-z- A-Z_)"
+  export "${prefix}_STUB_NOINDEX"=1
+  stub "$@"
+}
+
 run_inline_definition() {
   local definition="${BATS_TMPDIR}/build-definition"
   cat > "$definition"