Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 2, 2024

Updating bucket references from obs-ci-cache to ingest-buildkite-ci

Closes: https://github.com/elastic/ingest-dev/issues/3751


This is an automatic backport of pull request #454 done by Mergify.

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
(cherry picked from commit 206cfe2)

# Conflicts:
#	Makefile.common
#	README.md
#	go/Makefile.common
#	go/darwin/Dockerfile.tmpl
#	go/llvm-apple/Dockerfile.tmpl
#	go/main/Dockerfile.tmpl
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 2, 2024
Copy link
Author

mergify bot commented Oct 2, 2024

Cherry-pick of 206cfe2 has failed:

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

You are currently cherry-picking commit 206cfe2.
  (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)

Changes to be committed:
	modified:   go/base-arm/Dockerfile.tmpl
	modified:   go/base/Dockerfile.tmpl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Makefile.common
	both modified:   README.md
	both modified:   go/Makefile.common
	both modified:   go/darwin/Dockerfile.tmpl
	deleted by us:   go/llvm-apple/Dockerfile.tmpl
	both modified:   go/main/Dockerfile.tmpl

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

@elasticmachine
Copy link

@elasticmachine
Copy link

💔 Build Failed

Failed CI Steps

cc @rowlandgeoff

@elasticmachine
Copy link

⏳ Build in-progress, with failures

Failed CI Steps

cc @rowlandgeoff

@v1v
Copy link
Member

v1v commented Oct 2, 2024

unrequired... there are some changes that have not been backported... so let's keep it simple and forget about this branch

@v1v v1v closed this Oct 2, 2024
@v1v v1v deleted the mergify/bp/1.16/pr-454 branch October 2, 2024 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants