https://git.ruby-lang.org/ruby.git/commit/?id=c0c9a00f83

From c0c9a00f8301e100e2e05ffd101e2b8ff2bfe2ec Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 5 Nov 2019 00:48:22 +0900
Subject: Simplify test tasks

Removed `if` conditions separating `test-bundled-gems`, and pass
`TESTOPTS` and `TEST_BUNDLED_GEMS_ALLOW_FAILURES` via `env`.

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 941abd5..22794f8 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -55,16 +55,12 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/macos.yml#L55
       - name: Make
         run: make -C build $JOBS
       - name: Tests
-        run: make -C build -s ${{ matrix.test_task }} TESTOPTS="$JOBS -q --tty=no"
+        run: make -C build -s ${{ matrix.test_task }}
         env:
           MSPECOPT: "-ff" # not using `-j` because sometimes `mspec -j` silently dies
-        if: matrix.test_task != 'test-bundled-gems'
-      - name: Tests (test-bundled-gems)
-        # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
-        run: make -C build -s ${{ matrix.test_task }} TEST_BUNDLED_GEMS_ALLOW_FAILURES=minitest
-        env:
           RUBY_TESTOPTS: "-q --tty=no"
-        if: matrix.test_task == 'test-bundled-gems'
+          # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest"
       - name: Leaked Globals
         run: make -C build -s leaked-globals
       - uses: k0kubun/action-slack@v...
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 258de09..7db6b7a 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -79,16 +79,12 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/ubuntu.yml#L79
       - name: Make
         run: make -C build $JOBS
       - name: Tests
-        run: make -C build -s ${{ matrix.test_task }} TESTOPTS="$JOBS -q --tty=no"
+        run: make -C build -s ${{ matrix.test_task }}
         env:
           MSPECOPT: "-ff" # not using `-j` because sometimes `mspec -j` silently dies
-        if: matrix.test_task != 'test-bundled-gems'
-      - name: Tests (test-bundled-gems)
-        # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
-        run: make -C build -s ${{ matrix.test_task }} TEST_BUNDLED_GEMS_ALLOW_FAILURES=minitest
-        env:
           RUBY_TESTOPTS: "-q --tty=no"
-        if: matrix.test_task == 'test-bundled-gems'
+          # Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
+          TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest"
       - name: Leaked Globals
         run: make -C build -s leaked-globals
       - name: Debug GitHub context
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/