diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-12 18:12:42 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-07-12 18:12:42 +0000 |
| commit | abe84c7b030afa386c0c13db85b84b71ac1f6298 (patch) | |
| tree | b3d5febdfcef99c4ea6529200140609084bbad66 | |
| parent | Merge branch 'smaller-docker-image' into 'master' (diff) | |
| parent | Move index.html to simplify .gitlab-ci.yml (diff) | |
| download | pages-plain-html-abe84c7b030afa386c0c13db85b84b71ac1f6298.tar.gz | |
Merge branch 'simplify-gitlab-ci.yml' into 'master'
Move index.html to simplify .gitlab-ci.yml
## What does this MR do?
- move `index.html` to public folder
- simplify `.gitlab-ci.yml`
## Are there points in the code the reviewer needs to double check?
Not really...
## Why was this MR needed?
Every build moves the `index.html` to the public folder—which is unnecessary if it can be there from the beginning.
## What are the relevant issue numbers?
None.
See merge request !10
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | public/index.html (renamed from index.html) | 0 |
3 files changed, 3 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df97d99..ec73d9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,11 +3,9 @@ image: alpine:latest pages: stage: deploy script: - - mkdir .public - - cp -r * .public - - mv .public public + - echo 'Nothing to do...' artifacts: paths: - public only: - - master
\ No newline at end of file + - master @@ -29,9 +29,7 @@ defined in [`.gitlab-ci.yml`](.gitlab-ci.yml): pages: stage: deploy script: - - mkdir .public - - cp -r * .public - - mv .public public + - echo 'Nothing to do...' artifacts: paths: - public diff --git a/index.html b/public/index.html index c5cec8a..c5cec8a 100644 --- a/index.html +++ b/public/index.html |