summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-07-24 13:09:18 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-07-24 13:09:18 +0000
commitd5214bb6ff38ab31817ad5cb6e3436e52c4792a7 (patch)
treea5b605f878e512c581449500aba2a57be43e2c8a
parentff5812c7d4ed5f844ff9ccb5ecd0a4d22f38bd21 (diff)
parent59b21b9d588a02231451f0d1e02ed4ac209e3d93 (diff)
downloadgitlab-ci-d5214bb6ff38ab31817ad5cb6e3436e52c4792a7.tar.gz
Merge branch 'detail-two-possibilities-for-scripts' into 'master'
Detail that people can use script to do `rake rspec` but also to call a `tests.sh` See merge request !209
-rw-r--r--doc/yaml/README.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/yaml/README.md b/doc/yaml/README.md
index 67e5ac1..9922a2c 100644
--- a/doc/yaml/README.md
+++ b/doc/yaml/README.md
@@ -14,7 +14,8 @@ job2:
```
The above example is the simplest possible CI configuration with two separate jobs,
-where each of the jobs executes a different script.
+where each of the jobs executes a different command.
+Of course a command can execute code directly (`./configure;make;make install`) or run a script (`test.sh`) in the repository.
Jobs are used to create builds, which are then picked up by [runners](../runners/README.md) and executed within the environment of the runner.
What is important, is that each job is run independently from each other.
@@ -179,4 +180,4 @@ Each instance of GitLab CI has an embedded debug tool called Lint.
You can find the link to the Lint in the project's settings page or use short url `/lint`.
## Skipping builds
-There is one more way to skip all builds, if your commit message contains tag [ci skip]. In this case, commit will be created but builds will be skipped
+There is one more way to skip all builds, if your commit message contains tag [ci skip]. In this case, commit will be created but builds will be skipped \ No newline at end of file