1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

YJIT: Fold check-yjit-bindings into yjit-bindgen

Browse Source 
So it's shorter on CI and the hint about how the fix the failure shows
up. It's going to print a diff locally too, but that should be fine.
This commit is contained in:
Alan Wu 2022-12-08 15:02:21 -05:00
parent 2ae26554de
commit 47a5b34aba
Notes: git 2022-12-08 20:58:19 +00:00 
Merged: https://github.com/ruby/ruby/pull/6883
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/yjit-ubuntu.yml vendored
View File

@ -47,7 +47,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- test_task: "check-yjit-bindings" - test_task: "yjit-bindgen"
hint: "To fix: use patch in logs" hint: "To fix: use patch in logs"
configure: "--with-gcc=clang-12 --enable-yjit=dev" configure: "--with-gcc=clang-12 --enable-yjit=dev"

5
yjit/yjit.mk
View File

@ -62,11 +62,8 @@ ifneq ($(strip $(CARGO)),) # if configure found Cargo
.PHONY: yjit-bindgen yjit-bindgen-show-unused .PHONY: yjit-bindgen yjit-bindgen-show-unused
yjit-bindgen: yjit.$(OBJEXT) yjit-bindgen: yjit.$(OBJEXT)
YJIT_SRC_ROOT_PATH='$(top_srcdir)' $(CARGO) run --manifest-path '$(top_srcdir)/yjit/bindgen/Cargo.toml' -- $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) YJIT_SRC_ROOT_PATH='$(top_srcdir)' $(CARGO) run --manifest-path '$(top_srcdir)/yjit/bindgen/Cargo.toml' -- $(CFLAGS) $(XCFLAGS) $(CPPFLAGS)
if [ 'x$(HAVE_GIT)' = xyes ]; then $(GIT) -C "$(top_srcdir)" diff --exit-code yjit/src/cruby_bindings.inc.rs; fi
check-yjit-bindgen-unused: yjit.$(OBJEXT) check-yjit-bindgen-unused: yjit.$(OBJEXT)
RUST_LOG=warn YJIT_SRC_ROOT_PATH='$(top_srcdir)' $(CARGO) run --manifest-path '$(top_srcdir)/yjit/bindgen/Cargo.toml' -- $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) 2>&1 | (! grep "unused option: --allow") RUST_LOG=warn YJIT_SRC_ROOT_PATH='$(top_srcdir)' $(CARGO) run --manifest-path '$(top_srcdir)/yjit/bindgen/Cargo.toml' -- $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) 2>&1 | (! grep "unused option: --allow")
# For CI, check whether YJIT's FFI bindings are up-to-date.
check-yjit-bindings: check-yjit-bindgen-unused
git -C "$(top_srcdir)" diff --exit-code yjit/src/cruby_bindings.inc.rs
endif endif