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

From abc4a46046c326263683a8b3611775c2ddd56a71 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 2 Jan 2022 01:25:33 +0900
Subject: Get rid of building main again when test-bundled-gems

---
 .github/workflows/ubuntu.yml      | 1 +
 .github/workflows/yjit-ubuntu.yml | 1 +
 common.mk                         | 3 ++-
 defs/gmake.mk                     | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index ff79dad880f..4c5fe0e818c 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -102,6 +102,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/ubuntu.yml#L102
           RUBY_TESTOPTS: "-q --tty=no"
           TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }}
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ""
+          PRECHECK_BUNDLED_GEMS: "no"
       - name: make skipped tests
         run: |
           $SETARCH make -s test-all TESTS=`echo "$TESTS" | sed 's| |$/ -n/|g;s|^|-n/|;s|$|$$/|'`
diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml
index c479b8a624a..b6fda32a54b 100644
--- a/.github/workflows/yjit-ubuntu.yml
+++ b/.github/workflows/yjit-ubuntu.yml
@@ -93,6 +93,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/yjit-ubuntu.yml#L93
         env:
           RUBY_TESTOPTS: "-q --tty=no"
           TEST_BUNDLED_GEMS_ALLOW_FAILURES: ""
+          PRECHECK_BUNDLED_GEMS: "no"
       - uses: k0kubun/action-slack@v...
         with:
           payload: |
diff --git a/common.mk b/common.mk
index 98d3993b232..cd4328f29e3 100644
--- a/common.mk
+++ b/common.mk
@@ -1372,6 +1372,7 @@ update-bundled_gems: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1372
 	git -C "$(srcdir)" diff --no-ext-diff --ignore-submodules --exit-code || \
 	git -C "$(srcdir)" commit -m "Update bundled_gems" gems/bundled_gems
 
+PRECHECK_BUNDLED_GEMS = test-bundled-gems-precheck
 test-bundled-gems-precheck: $(TEST_RUNNABLE)-test-bundled-gems-precheck
 yes-test-bundled-gems-precheck: main
 no-test-bundled-gems-precheck:
@@ -1383,7 +1384,7 @@ yes-test-bundled-gems-fetch: $(PREP) https://github.com/ruby/ruby/blob/trunk/common.mk#L1384
 	$(ACTIONS_ENDGROUP)
 no-test-bundled-gems-fetch:
 
-test-bundled-gems-prepare: test-bundled-gems-precheck test-bundled-gems-fetch
+test-bundled-gems-prepare: $(PRECHECK_BUNDLED_GEMS) test-bundled-gems-fetch
 test-bundled-gems-prepare: $(TEST_RUNNABLE)-test-bundled-gems-prepare
 no-test-bundled-gems-prepare: no-test-bundled-gems-precheck
 yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck
diff --git a/defs/gmake.mk b/defs/gmake.mk
index da1bdb4b7c2..c32fee0a6ca 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -35,7 +35,7 @@ TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS)) https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L35
 TEST_TARGETS := $(patsubst test-short,btest-ruby test-knownbug test-basic,$(TEST_TARGETS))
 TEST_TARGETS := $(patsubst test-bundled-gems,test-bundled-gems-run,$(TEST_TARGETS))
 TEST_TARGETS := $(patsubst test-bundled-gems-run,test-bundled-gems-run $(PREPARE_BUNDLED_GEMS),$(TEST_TARGETS))
-TEST_TARGETS := $(patsubst test-bundled-gems-prepare,test-bundled-gems-prepare test-bundled-gems-precheck test-bundled-gems-fetch,$(TEST_TARGETS))
+TEST_TARGETS := $(patsubst test-bundled-gems-prepare,test-bundled-gems-prepare $(PRECHECK_BUNDLED_GEMS) test-bundled-gems-fetch,$(TEST_TARGETS))
 TEST_DEPENDS := $(filter-out test-short $(TEST_TARGETS),$(TEST_DEPENDS))
 TEST_DEPENDS += $(if $(filter great exam love check,$(MAKECMDGOALS)),all exts)
 
-- 
cgit v1.2.1


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