diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-16 11:17:49 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-16 11:17:49 +0000 |
| commit | ba684aecd7bddd755743bec818df046115e017b7 (patch) | |
| tree | 42611d5fa4a49f874b43cd46f1fc7e6ae77b240f | |
| parent | 7994db791ab758d81f7a446eb8e2338336e184fd (diff) | |
| parent | 2b4aaaa8aa24cdd40df4ad0d351a45cfa9b18822 (diff) | |
| download | gitlab-ce-ba684aecd7bddd755743bec818df046115e017b7.tar.gz | |
Merge branch '58748-update-nodejs-to-10.15.3' into 'master'
Update Node.js to 10.15.3 in CI template for Hexo
See merge request gitlab-org/gitlab-ce!25943
| -rw-r--r-- | changelogs/unreleased/58748-update-nodejs-to-10-15-3.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/changelogs/unreleased/58748-update-nodejs-to-10-15-3.yml b/changelogs/unreleased/58748-update-nodejs-to-10-15-3.yml new file mode 100644 index 00000000000..4c7e4b5c604 --- /dev/null +++ b/changelogs/unreleased/58748-update-nodejs-to-10-15-3.yml @@ -0,0 +1,5 @@ +--- +title: Update node.js to 10.15.3 in CI template for Hexo +merge_request: 25943 +author: Takuya Noguchi +type: other diff --git a/lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml b/lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml index 02d02250bbf..a9e195370f7 100644 --- a/lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml @@ -1,10 +1,11 @@ # Full project: https://gitlab.com/pages/hexo -image: node:6.10.0 +image: node:10.15.3 pages: script: - - npm install - - ./node_modules/hexo/bin/hexo generate + - npm install hexo-cli -g + - test -e package.json && npm install + - hexo generate artifacts: paths: - public |