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

Fix RPC package build failure due to shell syntax issue #1268

Merged
merged 2 commits into from
Jul 31, 2023

Conversation

saiarcot895
Copy link
Contributor

@saiarcot895 saiarcot895 commented Jul 26, 2023

PR #1194 removed the .ONESHELL flag, causing commands for a target to be executed in separate shell environments. Because of that, multi-line shell code blocks aren't parsed correctly.

Since the syncd_init_common.sh file should always exist anyways (it's unconditionally sourced by an init script and a start script), remove the if-check around it, and always run sed when building rpc packages.

PR sonic-net#1194 removed the .ONESHELL flag (causing all commands for a target
to be executed in a single shell environment). Because of that,
multi-line shell code blocks aren't parsed correctly.

Since the `syncd_init_common.sh` file should always exist anyways (it's
unconditionally sourced by an init script and a start script), remove
the if-check around it, and always run `sed` when building rpc packages.

Signed-off-by: Saikrishna Arcot <[email protected]>
kcudnik
kcudnik previously approved these changes Jul 26, 2023
@saiarcot895 saiarcot895 marked this pull request as draft July 26, 2023 20:52
@saiarcot895 saiarcot895 force-pushed the fix-rpc-package-build branch from 6f14681 to e8f8953 Compare July 27, 2023 16:44
@saiarcot895 saiarcot895 marked this pull request as ready for review July 27, 2023 16:45
@saiarcot895
Copy link
Contributor Author

I was hoping to add a pipeline to build the RPC version, but looks like more changes are needed there. I'll try to address that in a separate PR.

@saiarcot895
Copy link
Contributor Author

/azp run Azure.sonic-sairedis

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@saiarcot895 saiarcot895 merged commit 4dbdb21 into sonic-net:master Jul 31, 2023
@saiarcot895 saiarcot895 deleted the fix-rpc-package-build branch July 31, 2023 23:45
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.

4 participants