diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-08-14 08:58:39 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-08-14 08:58:39 +0000 |
| commit | 2e03eac78e42dcd9230b68beeff987001fe42a96 (patch) | |
| tree | 6c86d365cc5ab54884e2dd096e9fd664e93dd04f | |
| parent | 2bb79b8eef40ef28a1fce64b1108bc05e0efafb0 (diff) | |
| parent | 2659d4e11a12712e4e2582836cdb8bee71ac3857 (diff) | |
| download | gitlab-ce-2e03eac78e42dcd9230b68beeff987001fe42a96.tar.gz | |
Merge branch 'upgrade-middleman-ci-template' into 'master'
Upgrade Middleman template for GitLab CI
See merge request gitlab-org/gitlab-ce!21174
| -rw-r--r-- | vendor/gitlab-ci-yml/Pages/Middleman.gitlab-ci.yml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/vendor/gitlab-ci-yml/Pages/Middleman.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/Middleman.gitlab-ci.yml index 9f4cc0574d6..983d7b5250e 100644 --- a/vendor/gitlab-ci-yml/Pages/Middleman.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Pages/Middleman.gitlab-ci.yml @@ -1,24 +1,25 @@ # Full project: https://gitlab.com/pages/middleman -image: ruby:2.3 +image: ruby:2.4 +variables: + LANG: "C.UTF-8" cache: paths: - vendor -test: - script: +before_script: - apt-get update -yqqq - apt-get install -y nodejs - bundle install --path vendor + +test: + script: - bundle exec middleman build except: - master pages: script: - - apt-get update -yqqq - - apt-get install -y nodejs - - bundle install --path vendor - bundle exec middleman build artifacts: paths: |