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

ci: ensure sorted json files #1683

Merged
merged 1 commit into from
Mar 9, 2022
Merged

ci: ensure sorted json files #1683

merged 1 commit into from
Mar 9, 2022

Conversation

Leeyoungone
Copy link
Contributor

@Leeyoungone Leeyoungone commented Dec 27, 2021 •
edited
Loading

@Leeyoungone Leeyoungone marked this pull request as draft December 27, 2021 19:52
@petermetz
Copy link
Contributor

@Leeyoungone No problem, just ping me when it's ready for review (I removed myself from the reviewers until then)

@Leeyoungone
Copy link
Contributor Author

@petermetz I've done the exact same thing for this PR that's linked to the issue I'm trying to solve and it seems like it's working while the other one isn't. I'm going to link this PR to the issue instead of the one that's currently linked to the issue I need to solve. Sorry for the confusion.

@Leeyoungone Leeyoungone changed the title ci: test branch ci: ensure sorted json files Dec 28, 2021
@Leeyoungone
Copy link
Contributor Author

@petermetz Ready for review!

@petermetz petermetz self-requested a review January 13, 2022 00:21
@petermetz petermetz marked this pull request as ready for review January 13, 2022 00:21
petermetz
petermetz reviewed Jan 13, 2022
View reviewed changes
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.

@Leeyoungone Sorry for the slow response! Please resolve the conflicts and then I'll have a go. Most likely the easiest to resolve the conflicts is to re-run the package.json sorting on whatever is on main right now instead of trying to resolve/untangle the conflicts manually.

@petermetz
Copy link
Contributor

@Leeyoungone Sorry, another conflict just popped up! :/

@Leeyoungone
Copy link
Contributor Author

@petermetz all good, just fixed it :)

petermetz
petermetz requested changes Jan 21, 2022
View reviewed changes
package.json Outdated Show resolved Hide resolved
@Leeyoungone Leeyoungone removed the request for review from izuru0 January 24, 2022 15:54
@Leeyoungone Leeyoungone marked this pull request as draft January 24, 2022 15:54
@petermetz
Copy link
Contributor

I duplicated this file from another script in thecustom-checks file. I commented this part of the code out because I thought I didn't need it, and i think I just forgot to delete it. Thank you :)

@Leeyoungone No worries at all, thank you for updating it!

petermetz
petermetz approved these changes Feb 2, 2022
View reviewed changes
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.

LGTM

izuru0
izuru0 approved these changes Feb 3, 2022
View reviewed changes
Copy link
Contributor

@izuru0 izuru0 left a comment

Choose a reason for hiding this comment

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

LGTM

petermetz
petermetz requested changes Feb 8, 2022
View reviewed changes
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.

@Leeyoungone LGTM but you have a conflict again, sorry :-(

@Leeyoungone
Copy link
Contributor Author

@Leeyoungone LGTM but you have a conflict again, sorry :-(

megasadge, it's okay I will fight the conflicts and win. brb

@Leeyoungone
Copy link
Contributor Author

@Leeyoungone LGTM but you have a conflict again, sorry :-(

I am done fighting the conflict :)

@petermetz
Copy link
Contributor

@Leeyoungone LGTM but you have a conflict again, sorry :-(

I am done fighting the conflict :)

@Leeyoungone Yay, nice, thank you and sorry for the slow response especially because in the meantime another conflict hit... :/
If you hit the re-request review button next time as soon as pushed the changes/fixes then it will pop up on my feed faster compared to if you just tag me in a comment saying that you did it (it's my fault for taking longer to check the comments though)

@Leeyoungone
Copy link
Contributor Author

If you hit the re-request review button next time as soon as pushed the changes/fixes then it will pop up on my feed faster compared to if you just tag me in a comment saying that you did it (it's my fault for taking longer to check the comments though)

Sounds good! Thanks for letting me know :))

petermetz
petermetz approved these changes Feb 28, 2022
View reviewed changes
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.

@Leeyoungone Thank you, LGTM :-)

petermetz
petermetz requested changes Feb 28, 2022
View reviewed changes
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.

@Leeyoungone Oops, sorry once again! I see that you have multiple commits but they do the same thing in the end. Could you please squash them into a single commit?

petermetz
petermetz approved these changes Mar 9, 2022
View reviewed changes
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.

@Leeyoungone LGTM

@Leeyoungone @petermetz
ci: ensure sorted package json files
1b97ecc 
Fixes 1341

Signed-off-by: Youngone Lee <youngone.lee@accenture.com>
@Leeyoungone Leeyoungone merged commit ccf27c2 into hyperledger-cacti:main Mar 9, 2022
@Leeyoungone Leeyoungone deleted the ciCheck branch March 9, 2022 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petermetz petermetz petermetz approved these changes

@takeutak takeutak Awaiting requested review from takeutak

@izuru0 izuru0 Awaiting requested review from izuru0 izuru0 is a code owner

Assignees
No one assigned
Labels
Developer_Experience enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ci: ensure sorted package.json files
3 participants
@Leeyoungone @petermetz @izuru0