Skip to content
This repository has been archived by the owner on Feb 19, 2025. It is now read-only.

Feat(now don't need to add so much info for adding a commit): #476

Closed
wants to merge 6 commits into from
Closed

Feat(now don't need to add so much info for adding a commit): #476

wants to merge 6 commits into from

Conversation

Suvendu-UI
Copy link
Contributor

@Suvendu-UI Suvendu-UI commented Jul 7, 2024

implementted commitizen easy to commit

fixed #477
Screenshot 2024-07-07 214606
Screenshot 2024-07-07 214619
Screenshot 2024-07-07 214632

@EandrewJones EandrewJones requested a review from Jyyjy July 8, 2024 15:55
@EandrewJones
Copy link
Contributor

EandrewJones commented Jul 8, 2024

Hi @Suvendu-UI, thanks for the PR and your interest in the project! We always welcome contributions.

I see this commit is for #447. We encourage discussion prior to opening PRs to help ensure alignment. Per the comments, we felt this issue needs more discussion before acting on a solution:

We do not necessarily want to manage version updates at the commit level. Is there a way to do this via commitizen or do we need an alternative?

I would love for you to work with us to find the right solution and help shepherd this PR through. I'll tag you in further discussion on the issue.

See here. I'm inclined to make this ticket just for commitizen.

@Suvendu-UI
Copy link
Contributor Author

Hey, @EandrewJones , how are you, i was looking for easier ways to commit the changes without much hecticness involved , i was googling it and got a automated ai which commits instantly which is almost equiv. to commitizen.

Here is the link https://github.com/christian-gama/autocommit

@EandrewJones
Copy link
Contributor

EandrewJones commented Jul 8, 2024 via email

Copy link
Contributor

@Jyyjy Jyyjy left a comment

Choose a reason for hiding this comment

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

A couple things.

  1. For the GitHub action pipeline to succeed, add the new .czrc file to the ignored paths in .licenserc.yaml. Every file that can have a APL 2.0 license header must. In this case, .czrc is JSON, so it cannot have a header and should be ignored.
  2. This project uses pre-commit hooks to minimize surprise failures from GitHub actions. Please install.
  3. Ignore the first point because I don't think .czrc is needed. Based on the docs, you should define the commitizen config either in package.json or .czrc. Package.json is preferred to limit root dir clutter.

Thanks for taking interest in our project. Out of curiosity, are you a Google summer of code participant?

@Suvendu-UI
Copy link
Contributor Author

Hey @Jyyjy i think i have resolved the requested changes

@EandrewJones
Copy link
Contributor

@Suvendu-UI There's a tiny conflict that needs to be resolved before we can merge this. You should be able to:

  1. rebase this branch on top of the latest changes from master
  2. select either package-lock.json file, i.e. git checkout --ours package-lock.json
  3. reinstall, build, and push

Pinging @Jyyjy for his final look over.

@Suvendu-UI
Copy link
Contributor Author

done all the steps @EandrewJones and @Jyyjy

@EandrewJones
Copy link
Contributor

EandrewJones commented Jul 11, 2024

@Suvendu-UI There's still a conflict on package-lock.json.

Are you sure you've pulled down the most up-to-date changes from the upstream repo, i.e. apache/flagon-useralejs as opposed to just your fork (Suvendu-UI/flagon-useralejsGSOC)?

I see you're working directly off master on your fork (not recommended, but okay for now). That changes the steps slightly.

To be more explicit:

  1. git checkout master
  2. git pull upstream master where upstream points to the apache repo
  3. git push origin master where origin points to your fork
  4. This will raise a conflict in your package-lock.json. You should be able to resolve it by simply deleting the file, then re-installing npm install.
  5. Commit your changes and push them to your fork.

@Suvendu-UI
Copy link
Contributor Author

now all resolved i guess @EandrewJones

@Suvendu-UI
Copy link
Contributor Author

i don't know why but i am unable to pass the npm ci error , i have tried all the possible method reinstalling the package-lock and package file fsversion , can you help me?

@EandrewJones
Copy link
Contributor

i don't know why but i am unable to pass the npm ci error , i have tried all the possible method reinstalling the package-lock and package file fsversion , can you help me?

I just got a chance to look into this. I've never seen this issue before 🤯

Let's try a few things:

  1. Can you share what node and npm versions you're using? Please ensure you're using a Node version >= 18.x.x. If you're not already using NVM, I recommend it (see here for more details).
  2. Check the suggested fixes here

You may need to delete the node_modules and package-lock.json, then using correct node version, try running npm i && npm ci.

@Suvendu-UI Suvendu-UI closed this Jul 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CI(commitizen): Implement Conventional Commit Logs
3 participants