Merge branch '42-create-auto-deployment-pipeline' into 'master'

Bugfix of ci pipeline

Closes #42

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!26
This commit is contained in:
Marcel Schwarz 2020-04-28 22:47:55 +00:00
commit 703bd5f51b

View File

@ -6,9 +6,8 @@ build-vue:
script: script:
- cd frontend - cd frontend
- docker build --pull -t vue . - docker build --pull -t vue .
only: rules:
- merge_requests - if: $CI_MERGE_REQUEST_ID
build-backend: build-backend:
image: docker:latest image: docker:latest
@ -18,13 +17,13 @@ build-backend:
script: script:
- cd backend - cd backend
- docker build --pull -t backend . - docker build --pull -t backend .
only: rules:
- merge_requests - if: $CI_MERGE_REQUEST_ID
build-android: build-android:
image: debian image: debian
stage: build stage: build
script: script:
- echo "To be done" - echo "To be done"
only: rules:
- merge_requests - if: $CI_MERGE_REQUEST_ID