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.

Sign up for GitHub

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

Jump to bottom

Delete serverless directory on backport PRs #3916

Merged
merged 6 commits into from
Jun 17, 2024
Merged

Delete serverless directory on backport PRs #3916

merged 6 commits into from
Jun 17, 2024

Conversation

bmorelli25
Copy link
Member

@bmorelli25 bmorelli25 commented May 22, 2024 •
edited
Loading

Simplified version of #3889 that doesn't work for some reason. Introduces conflicts. works after @colleenmcginnis fixed it.

@mergify Mergify
Copy link
Contributor

mergify bot commented May 22, 2024

This pull request does not have a backport label. Could you fix it @bmorelli25? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-/d./d is the label to automatically backport to the /d./d branch. /d is the digit
    NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label May 22, 2024
@bmorelli25 bmorelli25 marked this pull request as ready for review May 22, 2024 19:05
@bmorelli25 bmorelli25 requested a review from a team as a code owner May 22, 2024 19:05
@bmorelli25 bmorelli25 enabled auto-merge (squash) May 22, 2024 19:10
@bmorelli25 bmorelli25 mentioned this pull request May 30, 2024
Closed
@bmorelli25 bmorelli25 disabled auto-merge May 31, 2024 13:59
colleenmcginnis
colleenmcginnis reviewed Jun 3, 2024
View reviewed changes
Copy link
Contributor

@colleenmcginnis colleenmcginnis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. Can you add a note to the README about this? It would be good to have a place to point contributors if they notice this behavior and have questions about this.

@mergify Mergify
Copy link
Contributor

mergify bot commented Jun 17, 2024

This pull request is now in conflict. Could you fix it @bmorelli25? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b simplifed-action upstream/simplifed-action
git merge upstream/main
git push upstream simplifed-action

@bmorelli25 bmorelli25 added backport-7.17 Automated backport with mergify backport-8.13 Automated backport with mergify backport-8.14 Automated backport with mergify and removed backport-skip Skip notification from the automated backport with mergify labels Jun 17, 2024
@bmorelli25
Copy link
Member Author

Per Joe's testing, this needs to be backported to any branch where it will be used.

@bmorelli25 bmorelli25 requested a review from a team June 17, 2024 14:08
colleenmcginnis
colleenmcginnis approved these changes Jun 17, 2024
View reviewed changes
Copy link
Contributor

@colleenmcginnis colleenmcginnis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐦

@bmorelli25 bmorelli25 merged commit 4a57e39 into elastic:main Jun 17, 2024
17 checks passed
@bmorelli25 bmorelli25 deleted the simplifed-action branch June 17, 2024 14:22
mergify bot pushed a commit that referenced this pull request Jun 17, 2024
@bmorelli25 @mergify
Delete serverless directory on backport PRs (#3916)
7fb6654 
* simplified action that produces conflicts

* Update delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* add to readme

(cherry picked from commit 4a57e39)
@mergify mergify bot mentioned this pull request Jun 17, 2024
Merged
mergify bot pushed a commit that referenced this pull request Jun 17, 2024
@bmorelli25 @mergify
Delete serverless directory on backport PRs (#3916)
ef6b022 
* simplified action that produces conflicts

* Update delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* add to readme

(cherry picked from commit 4a57e39)

# Conflicts:
#	README.md
@mergify mergify bot mentioned this pull request Jun 17, 2024
Merged
mergify bot pushed a commit that referenced this pull request Jun 17, 2024
@bmorelli25 @mergify
Delete serverless directory on backport PRs (#3916)
6dcf875 
* simplified action that produces conflicts

* Update delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* add to readme

(cherry picked from commit 4a57e39)

# Conflicts:
#	README.md
@mergify mergify bot mentioned this pull request Jun 17, 2024
Merged
bmorelli25 added a commit that referenced this pull request Jun 17, 2024
@mergify @bmorelli25
Delete serverless directory on backport PRs (#3916) (#4013)
ea46a19 
* simplified action that produces conflicts

* Update delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* add to readme

(cherry picked from commit 4a57e39)

Co-authored-by: Brandon Morelli <[email protected]>
bmorelli25 added a commit that referenced this pull request Jun 17, 2024
@mergify @bmorelli25
[8.13](backport #3916) Delete serverless directory on backport PRs (#…
cc08bfa 
…4014)

* Delete serverless directory on backport PRs (#3916)

* simplified action that produces conflicts

* Update delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* add to readme

(cherry picked from commit 4a57e39)

# Conflicts:
#	README.md

* Update README.md

* Update README.md

---------

Co-authored-by: Brandon Morelli <[email protected]>
bmorelli25 added a commit that referenced this pull request Jun 17, 2024
@mergify @bmorelli25
[8.14](backport #3916) Delete serverless directory on backport PRs (#…
8e84312 
…4015)

* Delete serverless directory on backport PRs (#3916)

* simplified action that produces conflicts

* Update delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* add to readme

(cherry picked from commit 4a57e39)

# Conflicts:
#	README.md

* Update README.md

---------

Co-authored-by: Brandon Morelli <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@colleenmcginnis colleenmcginnis colleenmcginnis approved these changes

Assignees
No one assigned
Labels
backport-7.17 Automated backport with mergify backport-8.13 Automated backport with mergify backport-8.14 Automated backport with mergify needs-writer-review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bmorelli25 @colleenmcginnis