From 0a2a8c503c94b74704537fd7b0e47891c3e3a33c Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Fri, 4 May 2018 17:54:46 +0400 Subject: [PATCH] add ci --- .gitlab-ci.yml | 40 +++++++++++++++++------ README.md | 4 ++- src/main/resources/application.properties | 3 +- src/main/resources/templates/login.html | 3 +- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b35fd8..340d77f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,31 @@ -pages: - stage: deploy - script: - - mkdir .public - - cp -r * .public - - mv .public public - artifacts: +image: gradle:alpine + +cache: + key: "$CI_PROJECT_ID" + paths: + - .gradle/ + +variables: + GRADLE_OPTS: "-Dorg.gradle.daemon=false" + +#before_script: +build: + stage: build + script: gradle --build-cache assemble + cache: + key: "$CI_PROJECT_ID" + policy: push paths: - - public - only: - - master \ No newline at end of file + - build + - .gradle + + +#test: +# stage: test +# script: gradle check +# cache: +# key: "$CI_PROJECT_ID" +# policy: pull +# paths: +# - build +# - .gradle \ No newline at end of file diff --git a/README.md b/README.md index b4df1aa..e49ab34 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -landing \ No newline at end of file +landing + +--ng-tracker.dev-mode=true \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8b7222a..ea20ef6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -33,4 +33,5 @@ liquibase.enabled=true liquibase.change-log=classpath:db/changelog-master.xml # Application Settings ng-tracker.base-url=https://127.0.0.1:8443 -ng-tracker.undead-user-login=admin \ No newline at end of file +ng-tracker.undead-user-login=admin +ng-tracker.dev-mode=true \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index fbf9a44..a2399f0 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,8 +1,7 @@ + xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">