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

Build If-merge #927

Merged
merged 24 commits into from
Aug 9, 2024
Merged

Build If-merge #927

merged 24 commits into from
Aug 9, 2024

Conversation

manushak
Copy link
Contributor

@manushak manushak commented Aug 1, 2024

Types of changes

  • Enhancement (project structure, spelling, grammar, formatting)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

A description of the changes proposed in the Pull Request

  • add if-merge command tool
  • there 2 scenarios to test:
    • with manifests list
      npm run if-merge -- -m ./manifests/examples/manifest1.yaml ./manifests/examples/manifest2.yaml --name 'merged manifest' --descriptions 'new manifest '
    • with directory path
      npm run if-merge -- -m ./manifests/examples/merge'

@manushak
fix(util): improve isDirectoryExists function in the fs.ts
729080a
@manushak
test(mocks): update fs.ts mocks
b5222ef
@manushak
fix(config): move DIRECTORY_NOT_FOUND from if-check into common config
c52ae5a
@manushak
fix(util): move DIRECTORY_NOT_FOUND from if-check into common config
431b30a
@manushak
fix(config): remove optional: false from if-csv to allow the lib to…
d02cf9c 
… handle error
@manushak
fix(config): remove PARAMS_NOT_PRESENT unneseccary string from if-csv
0ebccdf
@manushak
test(util): update if-check test related to changes
0dafebd
@manushak
feat(config): add config and string for if-merge
addd01b
@manushak
feat(types): add IFMergeArgs type
875c863
@manushak
feat(util): add args.ts for if-merge
a11de2e
@manushak
feat(util): add helpers functions for if-merge
0b680ee
@manushak
test(util): add tests for args.ts and helpers.ts
ac575ef
@manushak
feat(src): add if-merge logic
54a46d9
@manushak
feat(package): add if-merge command tool into package.json
1fa4326
@manushak manushak self-assigned this Aug 1, 2024
@manushak manushak linked an issue Aug 1, 2024 that may be closed by this pull request
Build if-merge #847
Closed
@manushak manushak changed the title If merge Build If-merge Aug 1, 2024
narekhovhannisyan
narekhovhannisyan reviewed Aug 1, 2024
View reviewed changes
package.json Outdated
@@ -1,5 +1,5 @@
{
"name": "@grnsft/if",
"name": "if-environment",
Copy link
Member

Choose a reason for hiding this comment

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

this bug is still here, please fix when you have window

narekhovhannisyan
narekhovhannisyan reviewed Aug 1, 2024
View reviewed changes
package.json Outdated Show resolved Hide resolved
manushak and others added 4 commits August 1, 2024 13:21
@manushak @narekhovhannisyan
Update package.json
8196169 
Co-authored-by: Narek Hovhannisyan <narekgilmour@gmail.com>
Signed-off-by: Manushak Keramyan <manushak.keramyan@gmail.com>
@manushak
fix(package): revert package name to correct one
49b2b5b
@manushak
test(util): add eslint comment
6f99d7f
@manushak
feat(util): imporve mergeManifests helper function
a828eb3
@manushak manushak marked this pull request as draft August 8, 2024 05:27
@manushak manushak marked this pull request as ready for review August 8, 2024 07:44
jmcook1186
jmcook1186 approved these changes Aug 8, 2024
View reviewed changes
Copy link
Contributor

@jmcook1186 jmcook1186 left a comment

Choose a reason for hiding this comment

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

lgtm!

@narekhovhannisyan narekhovhannisyan merged commit 9ddcede into main Aug 9, 2024
2 checks passed
@narekhovhannisyan narekhovhannisyan deleted the if-merge branch August 9, 2024 08:48
@github-actions github-actions bot mentioned this pull request Aug 9, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmcook1186 jmcook1186 jmcook1186 approved these changes

@narekhovhannisyan narekhovhannisyan narekhovhannisyan approved these changes

Assignees

@manushak manushak

Labels
None yet
Projects
IF
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build if-merge
3 participants
@manushak @narekhovhannisyan @jmcook1186