Commit 8ebf8a53 authored by hynek's avatar hynek 🤤
Browse files

Merge branch 'release/0.5.1'

parents 12723eaa 1872b5a3
image: docker:latest
services:
- docker:dind
include:
- template: Dependency-Scanning.gitlab-ci.yml
- template: Code-Quality.gitlab-ci.yml
- template: Container-Scanning.gitlab-ci.yml
- template: SAST.gitlab-ci.yml
variables:
DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2
CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
DS_PIP_DEPENDENCY_PATH: requirements/production.txt
stages:
- build
- test
- deploy
- release
tests:
stage: test
image: tiangolo/docker-with-compose
script:
- docker-compose -f local.yml build
# - docker-compose -f local.yml run --rm django pydocstyle
- docker-compose -f local.yml run --rm django flake8
- docker-compose -f local.yml run django coverage run -m pytest
- docker-compose -f local.yml run --rm django coverage html
- docker-compose -f local.yml run --rm django /bin/sh -c "cd docs && apk add make && make html"
- docker-compose -f local.yml run django coverage report
coverage: "/TOTAL.+ ([0-9]{1,3}%)/"
artifacts:
paths:
- htmlcov
- docs/_build
expire_in: 5 days
dependency_scanning:
stage: test
artifacts:
paths: [gl-dependency-scanning-report.json]
code_quality:
stage: test
artifacts:
paths: [gl-code-quality-report.json]
container_scanning:
stage: test
variables:
GIT_STRATEGY: fetch
DOCKER_USER: gitlab-ci-token
DOCKER_PASSWORD: $CI_BUILD_TOKEN
artifacts:
paths: [gl-container-scanning-report.json]
build:
stage: build
script:
- docker version
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
- docker build -t $CONTAINER_TEST_IMAGE -f compose/production/django/Dockerfile .
- docker push $CONTAINER_TEST_IMAGE
create_release:
image: node:8
stage: release
script:
- npx semantic-release
only:
- master
release_image:
stage: deploy
script:
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
- docker pull $CONTAINER_TEST_IMAGE
- docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE
- docker push $CONTAINER_RELEASE_IMAGE
only:
- tags
pages:
stage: deploy
script:
- mkdir -p public/coverage
- mv htmlcov/* public/coverage
- mkdir -p public/docs
- mv -v docs/_build/html/* public/docs
artifacts:
paths:
- public
expire_in: 30 days
only:
- tags
......@@ -9,6 +9,12 @@ Open Platform for the Interactive Discussion of Research Data Quality (on the ex
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/ambv/black
:alt: Black code style
.. image:: https://img.shields.io/badge/commitizen-friendly-brightgreen.svg
:target: http://commitizen.github.io/cz-cli/
:alt: Commitizen friendly
.. image:: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
:target: https://github.com/semantic-release/semantic-release
:alt: semantic-release
:License: GPLv3
......@@ -114,5 +120,3 @@ Bootstrap's javascript as well as its dependencies is concatenated into a single
.. _in the bootstrap source: https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss
.. _Bootstrap docs: https://getbootstrap.com/docs/4.1/getting-started/theming/
......@@ -24,7 +24,7 @@ DEBUG = env.bool("DJANGO_DEBUG", False)
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# though not all of them may be available with every OS.
# In Windows, this must be set to your system time zone.
TIME_ZONE = "1"
TIME_ZONE = "Europe/Berlin"
# https://docs.djangoproject.com/en/dev/ref/settings/#language-code
LANGUAGE_CODE = "en-us"
# https://docs.djangoproject.com/en/dev/ref/settings/#site-id
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{
"name": "discuss_data",
"version": "0.5.0",
"version": "0.5.1",
"author": "Felix Herrmann <felix.herrmann@uni-bremen.de> (https://www.forschungsstelle.uni-bremen.de/de/3/20110606111622/20150601111026/Felix_Herrmann.html)",
"contributors": [
"Stefan Hynek <stefan.hynek@uni-goettingen.de> (https://www.sub.uni-goettingen.de/kontakt/personen-a-z/personendetails/person/stefan-hynek/)",
"Ubbo Veentjer <veentjer@sub.uni-goettingen.de> (https://www.sub.uni-goettingen.de/kontakt/personen-a-z/personendetails/person/ubbo-veentjer/)"
],
"bugs": {
"url": "https://gitlab.gwdg.de/discuss-data/discuss-data/issues"
},
"private": true,
"dependencies": {},
"devDependencies": {
"bootstrap": "4.3.1",
"gulp-concat": "^2.6.1",
"jquery": "3.3.1",
"popper.js": "1.14.3",
"@semantic-release/gitlab-config": "^6.0.1",
"autoprefixer": "^9.4.7",
"bootstrap": "4.3.1",
"browser-sync": "^2.14.0",
"commitizen": "^4.0.3",
"cssnano": "^4.1.10",
"cz-conventional-changelog": "^3.0.2",
"gulp": "^4.0.0",
"gulp-concat": "^2.6.1",
"gulp-imagemin": "^5.0.3",
"gulp-plumber": "^1.2.1",
"gulp-postcss": "^8.0.0",
"gulp-rename": "^1.2.2",
"gulp-sass": "^4.0.2",
"gulp-uglify-es": "^1.0.4",
"pixrem": "^5.0.0"
"jquery": "^3.4.1",
"pixrem": "^5.0.0",
"popper.js": "1.14.3",
"semantic-release": "^15.13.31"
},
"engines": {
"node": ">=8"
......@@ -28,5 +41,18 @@
"scripts": {
"dev": "gulp",
"build": "gulp generate-assets"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
},
"release": {
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/npm",
"@semantic-release/gitlab"
]
}
}
Markdown is supported
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