ruby-changes:60494
From: Kazuhiro <ko1@a...>
Date: Tue, 24 Mar 2020 15:37:17 +0900 (JST)
Subject: [ruby-changes:60494] 930b012ad9 (master): Add rexml to fix rss of test-bundled-gems (#2976)
https://git.ruby-lang.org/ruby.git/commit/?id=930b012ad9 From 930b012ad96bfb0bd12446b89407120744ef92eb Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA <znz@u...> Date: Tue, 24 Mar 2020 15:36:53 +0900 Subject: Add rexml to fix rss of test-bundled-gems (#2976) 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: https://github.com/ruby/ruby/blob/trunk/.github/workflows/macos.yml#L51 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@v... 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: https://github.com/ruby/ruby/blob/trunk/.github/workflows/ubuntu.yml#L65 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@v... 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) https://github.com/ruby/ruby/blob/trunk/common.mk#L1320 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 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/