diff options
| author | Evan Read <eread@gitlab.com> | 2019-07-23 01:59:40 +0000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-07-23 01:59:40 +0000 |
| commit | 61f42e272d4f1aa83d127de5c3964d2c4ae6b537 (patch) | |
| tree | 9e7c6a5432f3b99172a7da7f4c92ed5286dca69f | |
| parent | Merge branch 'docs-runner-markdown-2' into 'master' (diff) | |
| parent | Update docs to specify default shell of OS (diff) | |
| download | gitlab-runner-61f42e272d4f1aa83d127de5c3964d2c4ae6b537.tar.gz | |
Merge branch 'docs/update-default-shell-for-windows' into 'master'
Update docs to specify default shell of OS
See merge request gitlab-org/gitlab-runner!1485
| -rw-r--r-- | docs/executors/README.md | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/docs/executors/README.md b/docs/executors/README.md index 12295fad..4a090d1e 100644 --- a/docs/executors/README.md +++ b/docs/executors/README.md @@ -119,10 +119,16 @@ Supported systems by different shells: | Shells | Bash | Windows Batch | PowerShell | |:-------:|:-----------:|:-------------:|:----------:| -| Windows | ✓ | ✓ (default) | ✓ | -| Linux | ✓ (default) | ✗ | ✗ | -| OSX | ✓ (default) | ✗ | ✗ | -| FreeBSD | ✓ (default) | ✗ | ✗ | +| Windows | ✓ | ✓ (2) | ✓ (3) | +| Linux | ✓ (1) | ✗ | ✗ | +| OSX | ✓ (1) | ✗ | ✗ | +| FreeBSD | ✓ (1) | ✗ | ✗ | + +1. Default shell. +1. Default shell if no + [`shell`](../configuration/advanced-configuration.md#the-runners-section) + is specified. +1. Default shell when a new GitLab Runner is registered. Supported systems for interactive web terminals by different shells: |