fix(2973): setup commands stuck with xterm #470
Merged
+11
−33
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
s-yoshika
commented
Dec 26, 2023
executor/executor.go
Outdated
| } | ||
| return nil | ||
| // ignore exit code in setup commands | ||
| _, err = copyLinesUntil(r, emitter, guid) |
There was a problem hiding this comment.
use copyLinesUntil same as doRunCommand to detect the end of commands.
s-yoshika
force-pushed
the
fix-stuck-setup-command
branch
from
be0217a to
09a34bb
Compare
s-yoshika
changed the title
s-yoshika
commented
Dec 26, 2023
| @@ -289,11 +267,11 @@ func Run(path string, env []string, emitter screwdriver.Emitter, build screwdriv | |||
| "EXITCODE=$?; " + | |||
| exportEnvCmd + | |||
| "echo $SD_STEP_ID $EXITCODE; }", //mv newfile to file | |||
| "trap finish ABRT EXIT;\necho ;\n", | |||
| "trap finish ABRT EXIT;echo " + guid + " $?\n", | |||
There was a problem hiding this comment.
change echo command in this format
yakanechi
approved these changes
Dec 26, 2023
yuichi10
approved these changes
Dec 26, 2023
kumada626
approved these changes
Dec 26, 2023
sakka2
approved these changes
Dec 27, 2023
tkyi
approved these changes
Dec 28, 2023
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Context
Please refer to screwdriver-cd/screwdriver#2973
Some environment(especially when using xterm), setup-launcher step is stuck.
Currently doRunSetupCommand, which read setupCommands output until it finds an empty line, can't detect the empty line correctly when xterm is set, because the output has terminal sequences as prefix like following.
Objective
Fix setup-launcher not to stuck even if using xterm.
References
License
I confirm that this contribution is made under the terms of the license found in the root directory of this repository's source tree and that I have the authority necessary to make this contribution on behalf of its copyright owner.