mirror of
https://git.coop/cotech/website.git
synced 2024-10-31 22:08:44 +00:00
Merge branch 'dev' of git.coop:cotech/website into dev
This commit is contained in:
commit
9de6c66eae
@ -24,16 +24,25 @@ test:
|
|||||||
except:
|
except:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
pages:
|
deploy:production:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
script:
|
script:
|
||||||
- bundle exec jekyll build -d public
|
- bundle exec jekyll build -d public
|
||||||
- rsync -aqz public/ cotech@webarch2.co.uk:sites/default/
|
- rsync -aqz public/ cotech@webarch2.co.uk:sites/default/
|
||||||
- cd public ; git checkout dev ; cd -
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- public
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
|
||||||
|
|
||||||
|
deploy:dev:
|
||||||
|
stage: deploy
|
||||||
|
script:
|
||||||
- bundle exec jekyll build -d public
|
- bundle exec jekyll build -d public
|
||||||
- rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/
|
- rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- public
|
- public
|
||||||
only:
|
only:
|
||||||
- master
|
- dev
|
Loading…
Reference in New Issue
Block a user