ci: enable rebase in some situation#7074
Merged
Merged
Conversation
As discussed, now we decide to allow using rebase only when backport multiple commits to the `release/xx` branch. Therefore we can preserve the commit message. Signed-off-by: spacewander <[email protected]>
tokers
approved these changes
May 18, 2022
tzssangglass
approved these changes
May 18, 2022
Liu-Junlin
pushed a commit
to Liu-Junlin/apisix
that referenced
this pull request
May 20, 2022
As discussed, now we decide to allow using rebase only when backport multiple commits to the `release/xx` branch. Therefore we can preserve the commit message. Signed-off-by: spacewander <[email protected]>
hongbinhsu
pushed a commit
to fitphp/apix
that referenced
this pull request
May 24, 2022
* upsgrteam/master: (351 commits) fix(proxy-cache): bypass when method mismatch cache_method (apache#7111) chore(script): support to install dependencies under arm64 (apache#7091) chore(ci): use the latest build script for apisix-base (apache#7090) fix(batch-requests): ignore "unix:" in the configuration (apache#7106) fix: install dependencies issues (apache#7092) feat(ops): use lua libs to backup config file insteadof shell command (apache#7048) test: reduce CI failure caused by flaky tests (apache#7085) chore(ci): move set_dns.sh to ci dir (apache#7089) feat: release 2.14.0 (apache#7057) docs: update "Tracers" Plugins (apache#7086) docs: update "Traffic" Plugin docs 3 (apache#7064) docs: update "Serverless" Plugins (apache#7076) feat(ops): check process running with posix.signal insteadof lsof (apache#7006) docs: modify how-to-build filename (apache#7087) docs: fix link of hot-reload in docs (apache#7081) chore(ci): apt update before install (apache#7080) docs: add pubsub develop example for kafka (apache#7059) ci: enable rebase in some situation (apache#7074) fix: redirect http to https but port not change (apache#7065) ci: make it pass under OpenResty 1.21 (apache#7067) ...
spacewander
added a commit
that referenced
this pull request
Jun 30, 2022
As discussed, now we decide to allow using rebase only when backport multiple commits to the `release/xx` branch. Therefore we can preserve the commit message. Signed-off-by: spacewander <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As discussed, now we decide to allow using rebase only when backport
multiple commits to the
release/xxbranch. Therefore we can preservethe commit message.
Signed-off-by: spacewander [email protected]
Description
Fixes # (issue)
Checklist