kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Use configured GIT

Browse source
This commit is contained in:
Nobuyoshi Nakada 2022-08-05 02:40:49 +09:00
parent 70b60d24b9
commit 87d8d25796
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
2 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common.mk
View file

@ -1374,8 +1374,8 @@ update-bundled_gems: PHONY
$(tooldir)/update-bundled_gems.rb \ $(tooldir)/update-bundled_gems.rb \
"$(srcdir)/gems/bundled_gems" | \ "$(srcdir)/gems/bundled_gems" | \
$(IFCHANGE) "$(srcdir)/gems/bundled_gems" - $(IFCHANGE) "$(srcdir)/gems/bundled_gems" -
git -C "$(srcdir)" diff --no-ext-diff --ignore-submodules --exit-code || \ $(GIT) -C "$(srcdir)" diff --no-ext-diff --ignore-submodules --exit-code || \
git -C "$(srcdir)" commit -m "Update bundled_gems" gems/bundled_gems $(GIT) -C "$(srcdir)" commit -m "Update bundled_gems" gems/bundled_gems
PRECHECK_BUNDLED_GEMS = test-bundled-gems-precheck PRECHECK_BUNDLED_GEMS = test-bundled-gems-precheck
test-bundled-gems-precheck: $(TEST_RUNNABLE)-test-bundled-gems-precheck test-bundled-gems-precheck: $(TEST_RUNNABLE)-test-bundled-gems-precheck

68
defs/gmake.mk
View file

@ -183,8 +183,8 @@ commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS
GITHUB_RUBY_URL = https://github.com/ruby/ruby GITHUB_RUBY_URL = https://github.com/ruby/ruby
PR = PR =
COMMIT_GPG_SIGN = $(shell git -C "$(srcdir)" config commit.gpgsign) COMMIT_GPG_SIGN = $(shell $(GIT) -C "$(srcdir)" config commit.gpgsign)
REMOTE_GITHUB_URL = $(shell git -C "$(srcdir)" config remote.github.url) REMOTE_GITHUB_URL = $(shell $(GIT) -C "$(srcdir)" config remote.github.url)
COMMITS_NOTES = commits COMMITS_NOTES = commits
.PHONY: fetch-github .PHONY: fetch-github
@ -197,21 +197,21 @@ define fetch-github
exit 1; \ exit 1; \
) )
$(eval REMOTE_GITHUB_URL := $(REMOTE_GITHUB_URL)) $(eval REMOTE_GITHUB_URL := $(REMOTE_GITHUB_URL))
$(if $(REMOTE_GITHUB_URL),, \ $(if $(REMOTE_GITHUB_URL),,
echo adding $(GITHUB_RUBY_URL) as remote github; \ echo adding $(GITHUB_RUBY_URL) as remote github
git -C "$(srcdir)" remote add github $(GITHUB_RUBY_URL); \ $(GIT) -C "$(srcdir)" remote add github $(GITHUB_RUBY_URL)
git -C "$(srcdir)" config --add remote.github.fetch +refs/notes/$(COMMITS_NOTES):refs/notes/$(COMMITS_NOTES) $(GIT) -C "$(srcdir)" config --add remote.github.fetch +refs/notes/$(COMMITS_NOTES):refs/notes/$(COMMITS_NOTES)
$(eval REMOTE_GITHUB_URL := $(GITHUB_RUBY_URL)) \ $(eval REMOTE_GITHUB_URL := $(GITHUB_RUBY_URL))
) )
$(if $(git -C "$(srcdir)" rev-parse "github/pull/$(1)/head" -- 2> /dev/null), \ $(if $(shell $(GIT) -C "$(srcdir)" rev-parse "github/pull/$(1)/head" -- 2> /dev/null),
git -C "$(srcdir)" branch -f "gh-$(1)" "github/pull/$(1)/head", \ $(GIT) -C "$(srcdir)" branch -f "gh-$(1)" "github/pull/$(1)/head",
git -C "$(srcdir)" fetch -f github "pull/$(1)/head:gh-$(1)" \ $(GIT) -C "$(srcdir)" fetch -f github "pull/$(1)/head:gh-$(1)"
) )
endef endef
.PHONY: checkout-github .PHONY: checkout-github
checkout-github: fetch-github checkout-github: fetch-github
git -C "$(srcdir)" checkout "gh-$(PR)" $(GIT) -C "$(srcdir)" checkout "gh-$(PR)"
.PHONY: update-github .PHONY: update-github
update-github: fetch-github update-github: fetch-github
@ -224,31 +224,31 @@ update-github: fetch-github
$(eval PR_BRANCH := $(word 2,$(PULL_REQUEST_FORK_BRANCH))) $(eval PR_BRANCH := $(word 2,$(PULL_REQUEST_FORK_BRANCH)))
$(eval GITHUB_UPDATE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(PR)-XXXXXX")) $(eval GITHUB_UPDATE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(PR)-XXXXXX"))
git -C "$(srcdir)" worktree add $(notdir $(GITHUB_UPDATE_WORKTREE)) "gh-$(PR)" $(GIT) -C "$(srcdir)" worktree add $(notdir $(GITHUB_UPDATE_WORKTREE)) "gh-$(PR)"
git -C "$(GITHUB_UPDATE_WORKTREE)" merge master --no-edit $(GIT) -C "$(GITHUB_UPDATE_WORKTREE)" merge master --no-edit
@$(BASERUBY) -e 'print "Are you sure to push this to PR=$(PR)? [Y/n]: "; exit(gets.chomp != "n")' @$(BASERUBY) -e 'print "Are you sure to push this to PR=$(PR)? [Y/n]: "; exit(gets.chomp != "n")'
git -C "$(srcdir)" remote add fork-$(PR) git@github.com:$(FORK_REPO).git $(GIT) -C "$(srcdir)" remote add fork-$(PR) git@github.com:$(FORK_REPO).git
git -C "$(GITHUB_UPDATE_WORKTREE)" push fork-$(PR) gh-$(PR):$(PR_BRANCH) $(GIT) -C "$(GITHUB_UPDATE_WORKTREE)" push fork-$(PR) gh-$(PR):$(PR_BRANCH)
git -C "$(srcdir)" remote rm fork-$(PR) $(GIT) -C "$(srcdir)" remote rm fork-$(PR)
git -C "$(srcdir)" worktree remove $(notdir $(GITHUB_UPDATE_WORKTREE)) $(GIT) -C "$(srcdir)" worktree remove $(notdir $(GITHUB_UPDATE_WORKTREE))
git -C "$(srcdir)" branch -D gh-$(PR) $(GIT) -C "$(srcdir)" branch -D gh-$(PR)
.PHONY: pull-github .PHONY: pull-github
pull-github: fetch-github pull-github: fetch-github
$(call pull-github,$(PR)) $(call pull-github,$(PR))
define pull-github define pull-github
$(eval GITHUB_MERGE_BASE := $(shell git -C "$(srcdir)" log -1 --format=format:%H)) $(eval GITHUB_MERGE_BASE := $(shell $(GIT) -C "$(srcdir)" log -1 --format=format:%H))
$(eval GITHUB_MERGE_BRANCH := $(shell git -C "$(srcdir)" symbolic-ref --short HEAD)) $(eval GITHUB_MERGE_BRANCH := $(shell $(GIT) -C "$(srcdir)" symbolic-ref --short HEAD))
$(eval GITHUB_MERGE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(1)-XXXXXX")) $(eval GITHUB_MERGE_WORKTREE := $(shell mktemp -d "$(srcdir)/gh-$(1)-XXXXXX"))
git -C "$(srcdir)" worktree prune $(GIT) -C "$(srcdir)" worktree prune
git -C "$(srcdir)" worktree add $(notdir $(GITHUB_MERGE_WORKTREE)) "gh-$(1)" $(GIT) -C "$(srcdir)" worktree add $(notdir $(GITHUB_MERGE_WORKTREE)) "gh-$(1)"
git -C "$(GITHUB_MERGE_WORKTREE)" rebase $(GITHUB_MERGE_BRANCH) $(GIT) -C "$(GITHUB_MERGE_WORKTREE)" rebase $(GITHUB_MERGE_BRANCH)
$(eval COMMIT_GPG_SIGN := $(COMMIT_GPG_SIGN)) $(eval COMMIT_GPG_SIGN := $(COMMIT_GPG_SIGN))
$(if $(filter true,$(COMMIT_GPG_SIGN)), \ $(if $(filter true,$(COMMIT_GPG_SIGN)), \
git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git commit --amend --no-edit -S" "$(GITHUB_MERGE_BASE)"; \ $(GIT) -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "$(GIT) commit --amend --no-edit -S" "$(GITHUB_MERGE_BASE)"; \
) )
git -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "git notes add --message 'Merged: $(GITHUB_RUBY_URL)/pull/$(1)'" "$(GITHUB_MERGE_BASE)" $(GIT) -C "$(GITHUB_MERGE_WORKTREE)" rebase --exec "$(GIT) notes add --message 'Merged: $(GITHUB_RUBY_URL)/pull/$(1)'" "$(GITHUB_MERGE_BASE)"
endef endef
.PHONY: fetch-github-% .PHONY: fetch-github-%
@ -257,7 +257,7 @@ fetch-github-%:
.PHONY: checkout-github-% .PHONY: checkout-github-%
checkout-github-%: fetch-github-% checkout-github-%: fetch-github-%
git -C "$(srcdir)" checkout "gh-$*" $(GIT) -C "$(srcdir)" checkout "gh-$*"
.PHONY: pr-% pull-github-% .PHONY: pr-% pull-github-%
pr-% pull-github-%: fetch-github-% pr-% pull-github-%: fetch-github-%
@ -351,7 +351,7 @@ REVISION_IN_HEADER := none
REVISION_LATEST := update REVISION_LATEST := update
else else
REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null) REVISION_IN_HEADER := $(shell sed -n 's/^\#define RUBY_FULL_REVISION "\(.*\)"/\1/p' $(srcdir)/revision.h 2>/dev/null)
REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && git log -1 --format=%H 2>/dev/null) REVISION_LATEST := $(shell $(CHDIR) $(srcdir) && $(GIT) log -1 --format=%H 2>/dev/null)
endif endif
ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST)) ifneq ($(REVISION_IN_HEADER),$(REVISION_LATEST))
# GNU make treat the target as unmodified when its dependents get # GNU make treat the target as unmodified when its dependents get
@ -403,19 +403,19 @@ endif
update-deps: update-deps:
$(eval update_deps := $(shell date +update-deps-%Y%m%d)) $(eval update_deps := $(shell date +update-deps-%Y%m%d))
$(eval deps_dir := $(shell mktemp -d)/$(update_deps)) $(eval deps_dir := $(shell mktemp -d)/$(update_deps))
$(eval GIT_DIR := $(shell git -C $(srcdir) rev-parse --absolute-git-dir)) $(eval GIT_DIR := $(shell $(GIT) -C $(srcdir) rev-parse --absolute-git-dir))
git --git-dir=$(GIT_DIR) worktree add $(deps_dir) $(GIT) --git-dir=$(GIT_DIR) worktree add $(deps_dir)
cp $(tooldir)/config.guess $(tooldir)/config.sub $(deps_dir)/tool cp $(tooldir)/config.guess $(tooldir)/config.sub $(deps_dir)/tool
[ -f config.status ] && cp config.status $(deps_dir) [ -f config.status ] && cp config.status $(deps_dir)
cd $(deps_dir) && autoconf && \ cd $(deps_dir) && autoconf && \
exec ./configure -q -C --enable-load-relative --disable-install-doc --disable-rubygems 'optflags=-O0' 'debugflags=-save-temps=obj -g' exec ./configure -q -C --enable-load-relative --disable-install-doc --disable-rubygems 'optflags=-O0' 'debugflags=-save-temps=obj -g'
$(RUNRUBY) -C $(deps_dir) tool/update-deps --fix $(RUNRUBY) -C $(deps_dir) tool/update-deps --fix
git -C $(deps_dir) diff --no-ext-diff --ignore-submodules --exit-code || \ $(GIT) -C $(deps_dir) diff --no-ext-diff --ignore-submodules --exit-code || \
git -C $(deps_dir) commit --all --message='Update dependencies' $(GIT) -C $(deps_dir) commit --all --message='Update dependencies'
git --git-dir=$(GIT_DIR) worktree remove $(deps_dir) $(GIT) --git-dir=$(GIT_DIR) worktree remove $(deps_dir)
$(RMDIR) $(dir $(deps_dir)) $(RMDIR) $(dir $(deps_dir))
git --git-dir=$(GIT_DIR) merge --no-edit --ff-only $(update_deps) $(GIT) --git-dir=$(GIT_DIR) merge --no-edit --ff-only $(update_deps)
git --git-dir=$(GIT_DIR) branch --delete $(update_deps) $(GIT) --git-dir=$(GIT_DIR) branch --delete $(update_deps)
# order-only-prerequisites doesn't work for $(RUBYSPEC_CAPIEXT) # order-only-prerequisites doesn't work for $(RUBYSPEC_CAPIEXT)
# because the same named directory exists in the source tree. # because the same named directory exists in the source tree.