Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Jul 6, 2018

GitHub uses Linuguist for syntax highlighting, and Linuguist defines two related grammars:

  • Shell (alias sh), which applies to POSIX and similar shell languages.

  • ShellSession (alias console), which extends the Shell grammar with support for prompts and command output as you would usually see in an interactive shell session.

This commit consistently uses sh to highlight blocks which contain only shell commands (without prompts or output). And it uses console to highlight blocks which contain prompts, commands, and output.

I've also removed prompts blocks which contain no output, because in the no-output cases that approach seemed more popular within this repository.

I've also standardised on the sh alias, where this repository previously used both sh and shell.

@coreosbot
Copy link

Can one of the admins verify this patch?

@openshift-ci-robot openshift-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 6, 2018
@wking wking force-pushed the console-highlighting branch from 1715bca to 54fb231 Compare July 6, 2018 20:56
GitHub uses Linuguist for syntax highlighting [1], and Linuguist
defines two related grammars:

* Shell (alias 'sh') [2], which applies to POSIX and similar shell
  languages.

* ShellSession (alias 'console') [3], which extends the Shell grammar
  with support for prompts and command output as you would usually see
  in an interactive shell session.

This commit consistently uses 'sh' to highlight blocks which contain
only shell commands (without prompts or output).  And it uses
'console' to highlight blocks which contain prompts, commands, and
output.

I've also removed prompts blocks which contain no output, because in
the no-output cases that approach seemed more popular within this
repository.

I've also standardised on the 'sh' alias, where this repository
previously used both 'sh' and 'shell'.

I've also added continuation prompts (PS2) to the long
describe-auto-scaling-groups example, to keep the continued command
from being marked up as output.  And I've replaced the terminal \
continuation there with a terminal |; we need a pipe anyway so we
might as well save a character ;).

[1]: https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting
[2]: https://github.com/github/linguist/blob/v6.2.0/lib/linguist/languages.yml#L4317-L4378
[3]: https://github.com/github/linguist/blob/v6.2.0/lib/linguist/languages.yml#L4379-L4390
@wking wking force-pushed the console-highlighting branch from 54fb231 to ed9a89f Compare July 6, 2018 21:01
@squat
Copy link
Contributor

squat commented Jul 6, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 6, 2018
@squat
Copy link
Contributor

squat commented Jul 6, 2018

/ok-to-test

@openshift-ci-robot openshift-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 6, 2018
@openshift-ci-robot
Copy link
Contributor

@wking: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws ed9a89f link /test e2e-aws
Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@wking
Copy link
Member Author

wking commented Jul 7, 2018

The e2e-aws is the same operator Instantiate the template e2e-aws into the operator namespace and wait for any pods to complete as seen in #29. But this time the error message is:

pod e2e-aws was already deleted

@squat squat merged commit 3bc8830 into openshift:master Jul 9, 2018
@wking wking deleted the console-highlighting branch July 9, 2018 08:13
stbenjam pushed a commit to stbenjam/installer that referenced this pull request Feb 10, 2021
Add a manifest and ImageStream info for images needed by the CBO
mkumatag added a commit to mkumatag/installer that referenced this pull request Jul 28, 2021
Update default values to proceed with install
zaneb pushed a commit to zaneb/openshift-installer that referenced this pull request Apr 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants