summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazuhiro NISHIYAMA <znz@users.noreply.github.com>2020-03-24 15:36:53 +0900
committerGitHub <noreply@github.com>2020-03-24 15:36:53 +0900
commit930b012ad96bfb0bd12446b89407120744ef92eb (patch)
tree02bb0fa480b76bae202e41dfab56a545a41554e7
parentf6b6a7ad345c50eeb3f7206ceabdf41ba94b7d85 (diff)
Add rexml to fix rss of test-bundled-gems (#2976)
Notes
Notes: Merged-By: hsbt <hsbt@ruby-lang.org>
-rw-r--r--.github/workflows/macos.yml3
-rw-r--r--.github/workflows/ubuntu.yml3
-rw-r--r--common.mk2
3 files changed, 3 insertions, 5 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 940e42d..081cc31 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -51,8 +51,7 @@ jobs:
env:
RUBY_TESTOPTS: "-q --tty=no"
# Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
- # rss needs to add workaround for the non rexml environment
- TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rss,rexml"
+ TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rexml"
- uses: k0kubun/action-slack@v2.0.0
with:
payload: |
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index f45c9c6..090106f 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -65,8 +65,7 @@ jobs:
env:
RUBY_TESTOPTS: "-q --tty=no"
# Remove minitest from TEST_BUNDLED_GEMS_ALLOW_FAILURES if https://github.com/seattlerb/minitest/pull/798 is resolved
- # rss needs to add workaround for the non rexml environment
- TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc,rss"
+ TEST_BUNDLED_GEMS_ALLOW_FAILURES: "minitest,xmlrpc"
- uses: k0kubun/action-slack@v2.0.0
with:
payload: |
diff --git a/common.mk b/common.mk
index e85ad34..a49347c 100644
--- a/common.mk
+++ b/common.mk
@@ -1320,7 +1320,7 @@ test-bundled-gems-fetch: $(PREP)
test-bundled-gems-prepare: test-bundled-gems-precheck test-bundled-gems-fetch
$(XRUBY) -C "$(srcdir)" bin/gem install --no-document \
- --install-dir .bundle --conservative "bundler" "minitest:~> 5" 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga'
+ --install-dir .bundle --conservative "bundler" "minitest:~> 5" 'test-unit' 'rake' 'hoe' 'yard' 'pry' 'packnga' 'rexml'
PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems