complete rewrite #8

Manually merged
samuel-p merged 36 commits from develop into master 2020-06-30 15:59:35 +00:00
Showing only changes of commit cf8b6db63d - Show all commits

View file

@ -1,35 +1,13 @@
kind: pipeline kind: pipeline
type: docker type: docker
name: build name: build-develop
steps: steps:
- name: test
image: alpine
commands:
- pwd
- ls -ashl
- name: build - name: build
image: node image: node
commands: commands:
- npm install - npm install
- npm run build - npm run build
- name: test2
image: alpine
commands:
- pwd
- ls -ashl
---
kind: pipeline
type: docker
name: deploy-develop
steps:
- name: test
image: alpine
commands:
- pwd
- ls -ashl
- name: deploy - name: deploy
image: alpine image: alpine
environment: environment:
@ -43,9 +21,6 @@ steps:
- which lftp || ( apk --update add lftp ) - which lftp || ( apk --update add lftp )
- lftp -e "mirror -R ./dist/ dev.sp-codes.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST - lftp -e "mirror -R ./dist/ dev.sp-codes.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST
depends_on:
- build
trigger: trigger:
branch: branch:
- develop - develop
@ -53,9 +28,14 @@ trigger:
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
name: deploy-master name: build-master
steps: steps:
- name: build
image: node
commands:
- npm install
- npm run build
- name: deploy - name: deploy
image: alpine image: alpine
environment: environment:
@ -69,9 +49,6 @@ steps:
- which lftp || ( apk --update add lftp ) - which lftp || ( apk --update add lftp )
- lftp -e "mirror -R ./dist/ sp-codes.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST - lftp -e "mirror -R ./dist/ sp-codes.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST
depends_on:
- build
trigger: trigger:
branch: branch:
- master - master