Skip to content
Snippets Groups Projects
Commit 904da717 authored by Tom Käsler's avatar Tom Käsler
Browse files

Merge branch 'build' into 'master'

Build

See merge request swtp-block-ws17/arsnova-angular-frontend!113
parents ee5a8bc2 f57b2390
No related merge requests found
variables:
BUILD_DIR: dist
stages: stages:
- test - test
- build - build
...@@ -19,3 +22,32 @@ tslint: ...@@ -19,3 +22,32 @@ tslint:
- npm install rxjs - npm install rxjs
- node_modules/tslint/bin/tslint -p ./tsconfig.json -c ./tslint.json ./src/**/*.ts - node_modules/tslint/bin/tslint -p ./tsconfig.json -c ./tslint.json ./src/**/*.ts
ngbuild:
stage: build
tags:
- angular
allow_failure: false
dependencies: []
script:
- npm install -g @angular/cli
- npm install
- ng build --prod
artifacts:
paths:
- "$BUILD_DIR"
deploy:
stage: deploy
only:
- master
tags:
- ssh
dependencies:
- tslint
- ngbuild
script:
- eval $(ssh-agent -s)
- mkdir ~/.ssh #&& echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
- ssh-keyscan "$SERVER_URL" >> ~/.ssh/known_hosts
- ssh-add <(echo "$SSH_PRIVATE_KEY")
- scp -r "$BUILD_DIR"* "$SSH_URL"
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<textarea matInput #body [(ngModel)]="content.body" placeholder="Body" name="body"></textarea> <textarea matInput #body [(ngModel)]="content.body" placeholder="Body" name="body"></textarea>
</mat-form-field> </mat-form-field>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<form (ngSubmit)="submitContent()"> <form (ngSubmit)="submitContent(subject.value, body.value)">
<section class="choice-seformn" fxLayout="row" fxLayoutAlign="center" fxLayoutGap="20px"> <section class="choice-seformn" fxLayout="row" fxLayoutAlign="center" fxLayoutGap="20px">
<mat-checkbox (click)="singleChoice = true; multipleChoice = false;" <mat-checkbox (click)="singleChoice = true; multipleChoice = false;"
color="primary" [(ngModel)]="singleChoice" name="singleChoice">Single choice color="primary" [(ngModel)]="singleChoice" name="singleChoice">Single choice
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment