summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-10-20 21:18:27 +0900
committernagachika <nagachika@ruby-lang.org>2022-10-20 21:18:27 +0900
commit19ef027d77a2ef73e1a4cb567e050b4e23ea0592 (patch)
treeab2f7c4f9364d7a8ffaafc07982961b02ac21131
parent5932b426bc2edc27195d936152ec5a726405ec9e (diff)
merge revision(s) abc4a46046c326263683a8b3611775c2ddd56a71:
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(-)
-rw-r--r--.github/workflows/ubuntu.yml1
-rw-r--r--.github/workflows/yjit-ubuntu.yml1
-rw-r--r--common.mk3
-rw-r--r--defs/gmake.mk2
-rw-r--r--version.h2
5 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index ff79dad880..4c5fe0e818 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -102,6 +102,7 @@ jobs:
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 c479b8a624..b6fda32a54 100644
--- a/.github/workflows/yjit-ubuntu.yml
+++ b/.github/workflows/yjit-ubuntu.yml
@@ -93,6 +93,7 @@ jobs:
env:
RUBY_TESTOPTS: "-q --tty=no"
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ""
+ PRECHECK_BUNDLED_GEMS: "no"
- uses: k0kubun/action-slack@v2.0.0
with:
payload: |
diff --git a/common.mk b/common.mk
index 5188e74a8f..ad6c32de1d 100644
--- a/common.mk
+++ b/common.mk
@@ -1384,6 +1384,7 @@ update-bundled_gems: PHONY
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:
@@ -1395,7 +1396,7 @@ yes-test-bundled-gems-fetch: $(PREP)
$(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 bf3c383c4e..a19b8688c3 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -35,7 +35,7 @@ TEST_DEPENDS := $(filter-out test $(TEST_TARGETS),$(TEST_DEPENDS))
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)
diff --git a/version.h b/version.h
index 3363f5abd9..9b4f54e950 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 116
+#define RUBY_PATCHLEVEL 117
#define RUBY_RELEASE_YEAR 2022
#define RUBY_RELEASE_MONTH 10