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

v0.37.x: Removing all the vuepress related build files and references (backport #253) #263

Merged
merged 5 commits into from
Feb 8, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2023

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

On branch mergify/bp/v0.37.x/pr-253
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit d159562d0.
  (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:   Makefile
	deleted:    docs/.textlintrc.json
	deleted:    docs/.vuepress/styles/index.styl
	modified:   docs/architecture/README.md
	deleted:    docs/package-lock.json
	deleted:    docs/post.sh
	deleted:    docs/pre.sh
	deleted:    docs/stop-words.txt

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   RELEASES.md
	deleted by them: docs/.vuepress/config.js
	deleted by them: docs/.vuepress/redirects
	both modified:   docs/DOCS_README.md
	deleted by them: docs/package.json
	deleted by them: docs/versions

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

@mergify mergify bot requested a review from a team as a code owner February 2, 2023 20:17
@mergify mergify bot added the conflicts label Feb 2, 2023
@thanethomson
Copy link
Contributor

@Mergifyio rebase

* Removing all the vuepress related build files and references (#249)

* Moved documentation ADR to deprecated (#249)

* Reverting the logic for check-docs-toc until ADR/RFC refactor (#249)

* Setting the right permissions to file so workflow executes (#249)

* Reverting ADR change, will do in another issue (#249)

(cherry picked from commit d159562)

# Conflicts:
#	RELEASES.md
#	docs/.vuepress/config.js
#	docs/.vuepress/redirects
#	docs/DOCS_README.md
#	docs/package.json
#	docs/versions
@mergify
Copy link
Contributor Author

mergify bot commented Feb 7, 2023

⚠️ This pull request got rebased on behalf of a random user of the organization.
This behavior will change on the 1st February 2023, Mergify will pick the author of the pull request instead.

To get the future behavior now, you can configure bot_account options (e.g.: bot_account: { author } or update_bot_account: { author }.

Or you can create a dedicated github account for squash and rebase operations, and use it in different bot_account options.

@mergify
Copy link
Contributor Author

mergify bot commented Feb 7, 2023

rebase

✅ Branch has been successfully rebased

Copy link
Contributor

@andynog andynog left a comment

Choose a reason for hiding this comment

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

fixed merging issues, looks good to me now.

@cason cason changed the title Removing all the vuepress related build files and references (backport #253) v0.37.x: Removing all the vuepress related build files and references (backport #253) Feb 8, 2023
@andynog andynog merged commit 286121d into v0.37.x Feb 8, 2023
@andynog andynog deleted the mergify/bp/v0.37.x/pr-253 branch February 8, 2023 14:37
andynog added a commit that referenced this pull request Feb 8, 2023
fixing backport to v0.37 related to (#263)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants