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

Upgrade yq from v3.x to v4.x #721

Merged
merged 9 commits into from
Oct 24, 2023

Conversation

Deepjyoti-Sarmah
Copy link
Contributor

Some example scripts still use an older version of yq. To run the example scripts properly newer version of yq is added.

What this PR does / why we need it: Upgrades the yq V3.x to yq v4.x

Which issue(s) this PR fixes:

  • upgrades the yq from v3.x to v4.x
  • updates the yq codes in the list of files below :
  • ./samples/deployment/test-network/setup.sh
  • ./samples/deployment/fabric-smart-client/the-simple-testing-network/env.sh
  • ./samples/deployment/test-network/update-connection.sh
  • ./samples/deployment/test-network/fabric-samples/test-network-nano-bash/README.md
  • ./README.md
  • ./utils/docker/dev_peer_cc-builder/Dockerfile
  • ./utils/docker/base-dev/Dockerfile

Fixes #719

Some example scripts still use an older version of yq. To run the example scripts properly newer version of yq is added.

Signed-off-by: Deepjyoti-Sarmah <[email protected]>
@Deepjyoti-Sarmah Deepjyoti-Sarmah requested a review from a team as a code owner October 4, 2023 10:44
@@ -86,7 +86,7 @@ RUN go install golang.org/x/tools/cmd/goimports@latest \
&& go install github.com/maxbrunsfeld/counterfeiter/v6@latest \
&& go install honnef.co/go/tools/cmd/[email protected] \
&& go install github.com/client9/misspell/cmd/misspell@latest \
&& go install github.com/mikefarah/yq/v3@latest
&& go get github.com/mikefarah/yq/v4@latest
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe this should be go install ...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thank you pointing out the error and fixing it.

…thub.com/mikefarah/yq/v4@latest"

Signed-off-by: Deepjyoti-Sarmah <[email protected]>
Signed-off-by: Deepjyoti-Sarmah <[email protected]>
@mbrandenburger
Copy link
Contributor

@chenchanglew may I ask you to look at this PR as well and test fpc samples?

@chenchanglew
Copy link
Contributor

ya sure let me check it.

Copy link
Contributor

@mbrandenburger mbrandenburger left a comment

Choose a reason for hiding this comment

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

Thanks @Deepjyoti-Sarmah for this PR! I tested it almost worked. Here some changes.

samples/deployment/test-network/update-connection.sh Outdated Show resolved Hide resolved
samples/deployment/test-network/setup.sh Outdated Show resolved Hide resolved
samples/deployment/test-network/update-connection.sh Outdated Show resolved Hide resolved
samples/deployment/test-network/update-connection.sh Outdated Show resolved Hide resolved
samples/deployment/test-network/update-connection.sh Outdated Show resolved Hide resolved
samples/deployment/test-network/update-connection.sh Outdated Show resolved Hide resolved
@Deepjyoti-Sarmah
Copy link
Contributor Author

Hey @mbrandenburger thank you for the suggestion. I have made the required changes

Signed-off-by: Marcus Brandenburger <[email protected]>
@mbrandenburger mbrandenburger merged commit 78c6117 into hyperledger:main Oct 24, 2023
2 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.

Upgrade yq from v3.x to v4.x
3 participants