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

feat(openssl): version upgrade to v0.10.48 in cactus-plugin-keychain-vault #2412

Closed
wants to merge 2 commits into from
Closed

Conversation

Poonam1607
Copy link
Contributor

@Poonam1607 Poonam1607 commented May 2, 2023

fix: issue #2365

@Poonam1607 Poonam1607 changed the title version upgrade to v0.10.48 in cactus-plugin-keychain-vault feat(openssl): version upgrade to v0.10.48 in cactus-plugin-keychain-vault May 2, 2023
@sandeepnRES
Copy link
Contributor

@Poonam1607 Thanks for updating the PR, just one question, did you forget to add Cargo.lock changes, because that file was there in previous PR but not in this PR.
And if you decide to add Cargo.lock in this PR, please squash the new commit into current one, so that number of commits remain 1.

@Poonam1607
Copy link
Contributor Author

@Poonam1607 Thanks for updating the PR, just one question, did you forget to add Cargo.lock changes, because that file was there in previous PR but not in this PR. And if you decide to add Cargo.lock in this PR, please squash the new commit into current one, so that number of commits remain 1.

Can you guide me how to do that?
I am unable to do so.

@sandeepnRES
Copy link
Contributor

sandeepnRES commented May 2, 2023

@Poonam1607 Thanks for updating the PR, just one question, did you forget to add Cargo.lock changes, because that file was there in previous PR but not in this PR. And if you decide to add Cargo.lock in this PR, please squash the new commit into current one, so that number of commits remain 1.

Can you guide me how to do that? I am unable to do so.

Check this video: https://www.youtube.com/watch?v=7IfkL8swmFw
Then what you can do is, just create a commit with Cargo.lock. And based on steps in video, do a git rebase -i HEAD~2 (because we need to squash only last 2 commits), and then you will need to put squash instead of pick in the commit you are adding Cargo.lock.

@Poonam1607
Copy link
Contributor Author

@Poonam1607 Thanks for updating the PR, just one question, did you forget to add Cargo.lock changes, because that file was there in previous PR but not in this PR. And if you decide to add Cargo.lock in this PR, please squash the new commit into current one, so that number of commits remain 1.

Can you guide me how to do that? I am unable to do so.

Check this video: https://www.youtube.com/watch?v=7IfkL8swmFw Then what you can do is, just create a commit with Cargo.lock. And based on steps in video, do a git rebase -i HEAD~2 (because we need to squash only last 2 commits), and then you will need to put squash instead of pick in the commit you are adding Cargo.lock.

Hey @sandeepnRES! Thanks for the guidance. I did the steps you have mentioned and it is successful. But when I am pushing it again, it is showing this error:
git push
remote: Support for password authentication was removed on August 13, 2021.
remote: Please see https://docs.github.com/en/get-started/getting-started-with-git/about-remote-repositories#cloning-with-https-urls for information on currently recommended modes of authentication.
git push -u origin updated-openssl
remote: Permission to hyperledger/cacti.git denied to Poonam1607.
fatal: unable to access 'https://github.com/hyperledger/cacti.git/': The requested URL returned error: 403

@Poonam1607 Poonam1607 closed this by deleting the head repository May 4, 2023
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.

2 participants