Commit dc390c5a authored by Robert Speicher's avatar Robert Speicher

Merge branch 'patch-1' into 'master'

explicitly call script with bash for consistency

simpler than telling users to set script executable

[ci skip]

See merge request !2621
parents 5af15baa e32eb571
...@@ -97,7 +97,7 @@ image: php:5.6 ...@@ -97,7 +97,7 @@ image: php:5.6
before_script: before_script:
# Install dependencies # Install dependencies
- ci/docker_install.sh > /dev/null - bash ci/docker_install.sh > /dev/null
test:app: test:app:
script: script:
...@@ -112,7 +112,7 @@ with a different docker image version and the runner will do the rest: ...@@ -112,7 +112,7 @@ with a different docker image version and the runner will do the rest:
```yaml ```yaml
before_script: before_script:
# Install dependencies # Install dependencies
- ci/docker_install.sh > /dev/null - bash ci/docker_install.sh > /dev/null
# We test PHP5.6 # We test PHP5.6
test:5.6: test:5.6:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment