diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-11-05 00:48:22 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-11-05 02:12:26 +0900 |
| commit | c0c9a00f8301e100e2e05ffd101e2b8ff2bfe2ec (patch) | |
| tree | 5b1baa74f15444863c71880014a5d1ea4756eee6 /.github | |
| parent | 929a4aa722524f4567eed0d8b27d644f912c22f7 (diff) | |
| download | ruby-c0c9a00f8301e100e2e05ffd101e2b8ff2bfe2ec.tar.gz | |
Simplify test tasks
Removed `if` conditions separating `test-bundled-gems`, and pass
`TESTOPTS` and `TEST_BUNDLED_GEMS_ALLOW_FAILURES` via `env`.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/macos.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/ubuntu.yml | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 941abd5dd9..22794f88a3 100644 --- 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 index 258de091e8..7db6b7a62f 100644 --- 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 |