summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-10-21 17:17:54 +0900
committernagachika <nagachika@ruby-lang.org>2022-10-21 17:17:54 +0900
commit782bb163b7f08adf9f744ecade758268726e8775 (patch)
tree9716d4123ce58f63ada1a2a516b1f4245a10d640
parente9be76dc6937f15be8e6473cf726f395b749a7a7 (diff)
merge revision(s) 91c05b34cd9ca9120c4a5e5e9fe772f2f0d1f6a3:
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(-)
-rw-r--r--.github/workflows/compilers.yml2
-rw-r--r--.github/workflows/macos.yml4
-rw-r--r--.github/workflows/ubuntu.yml4
-rw-r--r--.github/workflows/yjit-ubuntu.yml4
-rw-r--r--version.h2
5 files changed, 7 insertions, 9 deletions
diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index 2af9fa55d8..cb2bca43b2 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -219,8 +219,6 @@ jobs:
- 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:
- name: Run configure
run: ../src/configure -C --disable-install-doc --with-openssl-dir=$(brew --prefix openssl@1.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 4c5fe0e818..8cba0e7272 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -85,11 +85,11 @@ jobs:
$SETARCH ../src/configure -C --disable-install-doc ${{ matrix.configure }}
${arch:+--target=$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 b6fda32a54..90780d6686 100644
--- a/.github/workflows/yjit-ubuntu.yml
+++ b/.github/workflows/yjit-ubuntu.yml
@@ -76,11 +76,11 @@ jobs:
- 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
- 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)")}'
diff --git a/version.h b/version.h
index 01935eed0e..151c5ccb9f 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 151
+#define RUBY_PATCHLEVEL 152
#define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 10