.github: use GNUMAKEFLAGS instead of JOBS

A bit readable to me.
See also https://github.com/ruby/ruby/pull/4880

7 files changed, 27 insertions, 27 deletions

diff --git a/.github/workflows/bundled_gems.yml b/.github/workflows/bundled_gems.yml
index d46c0704cd..265c7dc020 100644
--- a/.github/workflows/bundled_gems.yml
+++ b/.github/workflows/bundled_gems.yml
@@ -17,7 +17,7 @@ jobs:
 
       - name: Set ENV
         run: |
-          echo "JOBS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
+          echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
 
       - uses: actions/checkout@v2
 
@@ -42,12 +42,12 @@ jobs:
         run: |
           ./autogen.sh
           ./configure -C --disable-install-doc
-          make $JOBS
+          make
         if: ${{ steps.diff.outcome == 'failure' }}
 
       - name: Test bundled gems
         run: |
-          make $JOBS -s test-bundled-gems
+          make -s test-bundled-gems
         timeout-minutes: 30
         env:
           RUBY_TESTOPTS: "-q --tty=no"
diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index e6ad9db6e2..eb287d1b2c 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -200,7 +200,7 @@ jobs:
       - run: make test
       - run: make install
         if: ${{ matrix.entry.check }}
-      - run: /usr/local/bin/gem install --no-doc timezone tzinfo
+      - run: make prepare-gems
         if: ${{ matrix.entry.check }}
       - run: make test-tool
         if: ${{ matrix.entry.check }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 7c3f19f55b..8d7fee2970 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -27,18 +27,18 @@ jobs:
         working-directory: src
       - name: Set ENV
         run: |
-          echo "JOBS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV
+          echo "GNUMAKEFLAGS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV
       - run: ./autogen.sh
         working-directory: src
       - 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 $JOBS incs
-      - run: make $JOBS
+      - run: make incs
+      - run: make
       - run: make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
       - run: make prepare-gems
         if: ${{ matrix.test_task == 'check' }}
-      - run: make $JOBS -s ${{ matrix.test_task }}
+      - run: make -s ${{ matrix.test_task }}
         timeout-minutes: ${{ matrix.test_task == 'check' && 15 || 40 }}
         env:
           RUBY_TESTOPTS: "-q --tty=no"
diff --git a/.github/workflows/mjit.yml b/.github/workflows/mjit.yml
index 63011e78d0..3ec0f830d6 100644
--- a/.github/workflows/mjit.yml
+++ b/.github/workflows/mjit.yml
@@ -34,29 +34,29 @@ jobs:
           sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || :
       - name: Set ENV
         run: |
-          echo "JOBS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
+          echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
       - run: ./autogen.sh
         working-directory: src
       - name: Run configure
         run: ../src/configure -C --disable-install-doc cppflags=-DVM_CHECK_MODE
-      - run: make $JOBS incs
-      - run: make $JOBS
-      - run: sudo make $JOBS -s install
+      - run: make incs
+      - run: make
+      - run: sudo make -s install
       - run: sudo apt-get install gdb # used by test / test-all failure
       - name: Run test
         run: |
           ulimit -c unlimited
-          make $JOBS -s test RUN_OPTS="$RUN_OPTS"
+          make -s test RUN_OPTS="$RUN_OPTS"
         timeout-minutes: 60
       - name: Run test-all
         run: |
           ulimit -c unlimited
-          make $JOBS -s test-all RUN_OPTS="$RUN_OPTS"
+          make -s test-all RUN_OPTS="$RUN_OPTS"
         timeout-minutes: 60
       - name: Run test-spec
         run: |
           ulimit -c unlimited
-          make $JOBS -s test-spec RUN_OPTS="$RUN_OPTS"
+          make -s test-spec RUN_OPTS="$RUN_OPTS"
         timeout-minutes: 60
       - uses: k0kubun/action-slack@v2.0.0
         with:
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index e148b76cbe..b40a21b571 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -40,13 +40,13 @@ jobs:
           sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || :
       - name: Set ENV
         run: |
-          echo "JOBS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
+          echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
       - run: ./autogen.sh
         working-directory: src
       - name: Run configure
         run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
-      - run: make $JOBS incs
-      - run: make $JOBS
+      - run: make incs
+      - run: make
       - run: make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
       - run: make prepare-gems
@@ -55,7 +55,7 @@ jobs:
         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)")}'
         if: ${{ matrix.test_task == 'check' }}
-      - run: make $JOBS -s ${{ matrix.test_task }}
+      - run: make -s ${{ matrix.test_task }}
         timeout-minutes: 30
         env:
           RUBY_TESTOPTS: "-q --tty=no"
diff --git a/.github/workflows/yjit-macos.yml b/.github/workflows/yjit-macos.yml
index 8a1dd647cd..fbaa232900 100644
--- a/.github/workflows/yjit-macos.yml
+++ b/.github/workflows/yjit-macos.yml
@@ -34,18 +34,18 @@ jobs:
         working-directory: src
       - name: Set ENV
         run: |
-          echo "JOBS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV
+          echo "GNUMAKEFLAGS=-j$((1 + $(sysctl -n hw.activecpu)))" >> $GITHUB_ENV
       - run: ./autogen.sh
         working-directory: src
       - 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 $JOBS incs
-      - run: make $JOBS
+      - run: make incs
+      - run: make
       - run: make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
       - run: make prepare-gems
         if: ${{ matrix.test_task == 'check' }}
-      - run: make $JOBS -s ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS"
+      - run: make -s ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS"
         timeout-minutes: 60
         env:
           RUBY_TESTOPTS: "-q --tty=no"
diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml
index d82d8e6c64..ef2e5c75b1 100644
--- a/.github/workflows/yjit-ubuntu.yml
+++ b/.github/workflows/yjit-ubuntu.yml
@@ -52,13 +52,13 @@ jobs:
           sudo bash -c 'IFS=:; for d in '"$PATH"'; do chmod -v go-w $d; done' || :
       - name: Set ENV
         run: |
-          echo "JOBS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
+          echo "GNUMAKEFLAGS=-j$((1 + $(nproc --all)))" >> $GITHUB_ENV
       - run: ./autogen.sh
         working-directory: src
       - name: Run configure
         run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
-      - run: make $JOBS incs
-      - run: make $JOBS
+      - run: make incs
+      - run: make
       - run: make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
       - run: make prepare-gems
@@ -70,7 +70,7 @@ jobs:
       - name: Enable YJIT through ENV
         run: echo "RUBY_YJIT_ENABLE=1" >> $GITHUB_ENV
         if: ${{ matrix.yjit_enable_env }}
-      - run: make $JOBS -s ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS"
+      - run: make -s ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS"
         timeout-minutes: 60
         env:
           RUBY_TESTOPTS: "-q --tty=no"