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

From 91c05b34cd9ca9120c4a5e5e9fe772f2f0d1f6a3 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 17 Jul 2022 08:56:17 +0900
Subject: Bundled gems test needs `prepare-gems`

`prepare-gems` downloads and extracts the bundled gems, and these gems
are built by `build-exts` now.
---
 .github/workflows/bundled_gems.yml | 5 +++++
 .github/workflows/compilers.yml    | 2 --
 .github/workflows/macos.yml        | 4 ++--
 .github/workflows/ubuntu.yml       | 4 ++--
 .github/workflows/yjit-ubuntu.yml  | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/bundled_gems.yml b/.github/workflows/bundled_gems.yml
index 923fc524da..f6f8b9a45b 100644
--- a/.github/workflows/bundled_gems.yml
+++ b/.github/workflows/bundled_gems.yml
@@ -101,6 +101,11 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/bundled_gems.yml#L101
           make
         if: ${{ steps.diff.outcome == 'failure' }}
 
+      - name: Prepare bundled gems
+        run: |
+          make -s prepare-gems
+        if: ${{ steps.diff.outcome == 'failure' }}
+
       - name: Test bundled gems
         run: |
           make -s test-bundled-gems
diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index 4ec02e2b59..ab29a7acc5 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -249,8 +249,6 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/compilers.yml#L249
       - run: make test
       - run: make install
         if: ${{ matrix.entry.check }}
-      - run: make prepare-gems
-        if: ${{ matrix.entry.check }}
       - run: make test-tool
         if: ${{ matrix.entry.check }}
       - run: make test-all TESTS='-- ruby -ext-'
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index cf596148d9..2f2c876b15 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -55,11 +55,11 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/macos.yml#L55
       - name: Run configure
         run: ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1...) --with-readline-dir=$(brew --prefix readline)
       - run: make incs
+      - run: make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: make
       - run: make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
-      - run: make prepare-gems
-        if: ${{ matrix.test_task == 'check' }}
       - name: make ${{ matrix.test_task }}
         run: |
           make -s ${{ matrix.test_task }} ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 21bc285d7d..5662ca71ad 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -87,11 +87,11 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/ubuntu.yml#L87
           $SETARCH ../src/configure -C --disable-install-doc ${{ matrix.configure }}
           ${arch:+--target=$arch-$OSTYPE --host=$arch-$OSTYPE}
       - run: $SETARCH make incs
+      - run: $SETARCH make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: $SETARCH make
       - run: $SETARCH make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
-      - run: $SETARCH make prepare-gems
-        if: ${{ matrix.test_task == 'check' }}
       - name: Create dummy files in build dir
         run: |
           $SETARCH ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}'
diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml
index 5a86acb62c..105489aab4 100644
--- a/.github/workflows/yjit-ubuntu.yml
+++ b/.github/workflows/yjit-ubuntu.yml
@@ -98,11 +98,11 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/yjit-ubuntu.yml#L98
       - name: Run configure
         run: ../src/configure -C --disable-install-doc ${{ matrix.configure }}
       - run: make incs
+      - run: make prepare-gems
+        if: ${{ matrix.test_task == 'test-bundled-gems' }}
       - run: make -j
       - run: make leaked-globals
         if: ${{ matrix.test_task == 'check' }}
-      - run: make prepare-gems
-        if: ${{ matrix.test_task == 'check' }}
       - name: Create dummy files in build dir
         run: |
           ./miniruby -e '(("a".."z").to_a+("A".."Z").to_a+("0".."9").to_a+%w[foo bar test zzz]).each{|basename|File.write("#{basename}.rb", "raise %(do not load #{basename}.rb)")}'
-- 
cgit v1.2.1


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