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

chore(cleanup): deleted deprecated files and folders #3391

Merged
merged 1 commit into from
Jul 10, 2024
Merged

chore(cleanup): deleted deprecated files and folders #3391

merged 1 commit into from
Jul 10, 2024

Conversation

VRamakrishna
Copy link
Contributor

  • Deleted 'docs-cactus' and 'weaver/docs' folders.
  • Ensured that the latest contents in the above are reflected in the 'docs' folder.
  • Updated MAINTAINERS.md file with contents from 'weaver/MAINTAINERS.md'.
  • Deleted unnecessary 'MAINTAINERS.md' and 'CONTRIBUTING.md' in the 'weaver' folder.
  • Fixed indentations and removed dead code in source files. Modified GitHub action to test docs build upon change

Pull Request Requirements

  • Rebased onto upstream/main branch and squashed into single commit to help maintainers review it more efficient and to avoid spaghetti git commit graphs that obfuscate which commit did exactly what change, when and, why.
  • Have git sign off at the end of commit message to avoid being marked red. You can add -s flag when using git commit command. You may refer to this link for more information.
  • Follow the Commit Linting specification. You may refer to this link for more information.

Character Limit

  • Pull Request Title and Commit Subject must not exceed 72 characters (including spaces and special characters).
  • Commit Message per line must not exceed 80 characters (including spaces and special characters).

A Must Read for Beginners
For rebasing and squashing, here's a must read guide for beginners.

@VRamakrishna
Copy link
Contributor Author

@petermetz @sandeepnRES @outSH Sorry, I had to close another PR (https://github.com/hyperledger/cacti/pull/3370) and open this one as a replacement because of conflicts. You had already approved that one. Can you quickly review and approve this too?

@VRamakrishna
Copy link
Contributor Author

Sorry, I need to fix this failing action: https://github.com/hyperledger/cacti/actions/runs/9856543186/job/27213767125?pr=3391. Please don't merge before I do that.

Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

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

@VRamakrishna Next time please fix the conflicts instead of duplicating the PR. The effort required is roughly the same but that way we avoid confusion and duplicate review effort from the maintainers.
If you struggle with git operations I'm happy to help!

@VRamakrishna
Copy link
Contributor Author

@VRamakrishna Next time please fix the conflicts instead of duplicating the PR. The effort required is roughly the same but that way we avoid confusion and duplicate review effort from the maintainers. If you struggle with git operations I'm happy to help!

I'll do that. Sorry for the extra work. The closure of the older PR was not intended, but it happened because of a mistake (lack of git knowledge, as you mentioned). I couldn't then find a way to reopen the PR, and it just felt simpler to open a new one.

@VRamakrishna
Copy link
Contributor Author

@petermetz As I see, there are conflicts again. I'll try to follow the instructions to resolve them using the command line, as per the provided link.

@VRamakrishna
Copy link
Contributor Author

(Update) fixed conflicts with help from @sandeepnRES .

@VRamakrishna VRamakrishna enabled auto-merge (rebase) July 10, 2024 07:04
Deleted 'docs-cactus' and 'weaver/docs' folders.
Ensured that the latest contents in the above are reflected in the 'docs' folder.
Updated MAINTAINERS.md file with contents from 'weaver/MAINTAINERS.md'.
Deleted unnecessary 'MAINTAINERS.md' and 'CONTRIBUTING.md' in the 'weaver' folder.
Fixed indentations and removed dead code in source files.
Modified GitHub action to test docs build upon change

Signed-off-by: VRamakrishna <[email protected]>
@VRamakrishna VRamakrishna merged commit 6baaf66 into hyperledger-cacti:main Jul 10, 2024
144 of 146 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants