Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tool]disable block_cache on arm build (backport #18160) #19116

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 7, 2023

This is an automatic backport of pull request #18160 done by Mergify.
Cherry-pick of 9441456 has failed:

On branch mergify/bp/branch-2.5/pr-18160
Your branch is up to date with 'origin/branch-2.5'.

You are currently cherry-picking commit 9441456cc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   build.sh
	both modified:   thirdparty/build-thirdparty.sh

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* disable block_cache on arm build
* disable boost-test build
* fix openssl `Configure` parameter
* fix a few hardcoded path in `build-thirdparty.sh`, use pre-defined
  variable.
* ensure customized `gcc/g++` is found if some of the build packages
  don't respect CC/CXX/CPP settings

Signed-off-by: Kevin Xiaohua Cai <caixiaohua@starrocks.com>
(cherry picked from commit 9441456)

# Conflicts:
#	build.sh
#	thirdparty/build-thirdparty.sh
@kevincai
Copy link
Contributor

kevincai commented Mar 7, 2023

the conflict is fixed in pr #19146.

can close this PR for now.

@mergify mergify bot closed this Mar 27, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Mar 27, 2023

Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-18160 branch March 27, 2023 07:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant