Skip to content

[7.17](backport #39472) updatecli: move to the .github folder and support for signed commits#39578

Merged
v1v merged 2 commits into7.17from
mergify/bp/7.17/pr-39472
May 23, 2024
Merged

[7.17](backport #39472) updatecli: move to the .github folder and support for signed commits#39578
v1v merged 2 commits into7.17from
mergify/bp/7.17/pr-39472

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 15, 2024 •
edited by zube bot
Loading

Proposed commit message

updatecli: move to the .github folder and support for signed commits

To help with the migration from Jenkins so the .ci folder won't be needed for updatecli.
Use verified commits.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Similarly done in elastic/apm-server#13107

Use cases

Screenshots

Logs

This is an automatic backport of pull request #39472 done by [Mergify](https://mergify.com).

@v1v @mergify
updatecli: move to the .github folder and support for signed commits (#…
a17dc7f 
…39472)

(cherry picked from commit 46de7e0)

# Conflicts:
#	.github/workflows/bump-elastic-stack-snapshot.yml
#	.github/workflows/bump-golang.yml
#	.github/workflows/updatecli.d/bump-elastic-stack-snapshot.yml
#	.github/workflows/updatecli.d/bump-golang-7.17.yml
@mergify mergify bot requested a review from a team as a code owner May 15, 2024 12:45
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 15, 2024
@mergify mergify bot requested review from belimawr and rdner and removed request for a team May 15, 2024 12:45
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 15, 2024

Cherry-pick of 46de7e0 has failed:

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

You are currently cherry-picking commit 46de7e07de.
  (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:
	deleted:    .ci/bump-elastic-stack-snapshot.yml
	renamed:    .ci/bump-golang.yml -> .github/workflows/updatecli.d/bump-golang.yml
	new file:   .github/workflows/updatecli.d/scm.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/bump-elastic-stack-snapshot.yml
	both modified:   .github/workflows/bump-golang.yml
	both modified:   .github/workflows/updatecli.d/bump-elastic-stack-snapshot.yml
	deleted by us:   .github/workflows/updatecli.d/bump-golang-7.17.yml

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

@mergify mergify bot assigned v1v May 15, 2024
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 15, 2024
@botelastic
Copy link
Copy Markdown

botelastic bot commented May 15, 2024

This pull request doesn't have a Team:<team> label.

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 20, 2024

This pull request has not been merged yet. Could you please review and merge it @v1v? 🙏

v1v
v1v reviewed May 23, 2024
View reviewed changes
@v1v v1v enabled auto-merge (squash) May 23, 2024 08:07
@v1v v1v merged commit ca0d393 into 7.17 May 23, 2024
@v1v v1v deleted the mergify/bp/7.17/pr-39472 branch May 23, 2024 08:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@v1v v1v v1v approved these changes

@belimawr belimawr Awaiting requested review from belimawr belimawr is a code owner automatically assigned from elastic/elastic-agent-data-plane

@rdner rdner Awaiting requested review from rdner rdner is a code owner automatically assigned from elastic/elastic-agent-data-plane

Assignees

@v1v v1v

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@v1v