Skip to content
Snippets Groups Projects
Commit ae35dd07 authored by Henrik Teksle Sandok's avatar Henrik Teksle Sandok
Browse files

Merge branch 'master' into 'feat/setup-jpa-repositories'

# Conflicts:
#   .gitlab-ci.yml
parents 658b5d8e f9947edc
Branches feat/model-classes
No related tags found
1 merge request!7Feat/setup jpa repositories
Pipeline #274094 passed
......@@ -12,7 +12,7 @@ services:
variables:
MYSQL_ROOT_PASSWORD: "root" # TODO Set this in GitLab's CI/CD environment variables for security in production
MYSQL_DATABASE: "sparesti"
stages:
- compile_and_test
- generate_site_reports
......@@ -20,7 +20,7 @@ stages:
- publish_pages
cache:
key: "${CI_JOB_NAME}" # To keep cache across branches
key: "maven-repository" # Static Cache Key to keep cache across branches
paths:
- .m2/repository
......@@ -67,4 +67,4 @@ publish_pages:
paths:
- public
only:
- master
- master
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment