Simplify test tasks

Removed `if` conditions separating `test-bundled-gems`, and pass `TESTOPTS` and `TEST_BUNDLED_GEMS_ALLOW_FAILURES` via `env`.
ruby · Nov 4, 2019 · c0c9a00 · c0c9a00
1 parent 929a4aa
commit c0c9a00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -55,16 +55,12 @@ jobs:
       - 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@v2.0.0

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -79,16 +79,12 @@ jobs:
       - 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