diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-16 03:08:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-16 03:08:56 +0300 |
| commit | 3682a3a317e423498bfe56c38d21c6381b8ad04b (patch) | |
| tree | 890d76d74b5b64f8d0973b9da1bdd3b4f6d36705 /doc/ci/yaml/README.md | |
| parent | c083f926c5714ee4dcbb3ae497b14d4cb31aa794 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/yaml/README.md')
| -rw-r--r-- | doc/ci/yaml/README.md | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 27fbf1843b6..436353957f9 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -649,15 +649,18 @@ job: > Introduced in GitLab 8.7 and requires GitLab Runner v1.2. -`before_script` is used to define a command that should be run before each +`before_script` is used to define commands that should be run before each job, including deploy jobs, but after the restoration of any [artifacts](#artifacts). This must be an array. Scripts specified in `before_script` are concatenated with any scripts specified in the main [`script`](#script), and executed together in a single shell. -`after_script` is used to define the command that runs after each -job, including failed ones. This must be an array. +`after_script` is used to define commands that run after each +job, including failed jobs. This must be an array. If a job times out or is cancelled, +the `after_script` commands are not executed. Support for executing `after_script` +commands for timed-out or cancelled jobs +[is planned](https://gitlab.com/gitlab-org/gitlab/-/issues/15603). Scripts specified in `after_script` are executed in a new shell, separate from any `before_script` or `script` scripts. As a result, they: |