Commit eb585e82 authored by Steffen Vogel's avatar Steffen Vogel 🎅🏼
Browse files

fix CI

parent 7809c23d
variables: variables:
DOCKER_IMAGE: dpsim-dev-${CI_COMMIT_REF_NAME} DOCKER_TAG_DEV: ${CI_COMMIT_REF_NAME}
DOCKER_IMAGE_DEV: villas/dpsim-dev
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
stages: stages:
...@@ -11,7 +12,7 @@ stages: ...@@ -11,7 +12,7 @@ stages:
docker: docker:
stage: prepare stage: prepare
script: script:
- docker build -t ${DOCKER_IMAGE} . - docker build -t ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} .
tags: tags:
- shell - shell
...@@ -22,7 +23,7 @@ build: ...@@ -22,7 +23,7 @@ build:
- cd Source/build - cd Source/build
- cmake .. - cmake ..
- make - make
image: ${DOCKER_IMAGE} image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
artifacts: artifacts:
paths: paths:
- Source/build - Source/build
...@@ -33,7 +34,7 @@ docs: ...@@ -33,7 +34,7 @@ docs:
stage: docs stage: docs
script: script:
- make docs - make docs
image: ${DOCKER_IMAGE} image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
artifacts: artifacts:
paths: paths:
- Documentation/html - Documentation/html
...@@ -46,6 +47,6 @@ test: ...@@ -46,6 +47,6 @@ test:
PYTHONPATH: Source/build PYTHONPATH: Source/build
script: script:
- python3 Examples/Python/ci.py - python3 Examples/Python/ci.py
image: ${DOCKER_IMAGE} image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
tags: tags:
- docker - docker
FROM fedora:latest FROM registry.fedoraproject.org/fedora:27
MAINTAINER Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
LABEL \
org.label-schema.schema-version = "1.0" \
org.label-schema.name = "DPsim" \
org.label-schema.license = "GPL-3.0" \
org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \
org.label-schema.author.name = "Steffen Vogel" \
org.label-schema.author.email = "stvogel@eonerc.rwth-aachen.de" \
org.label-schema.url = "http://fein-aachen.org/projects/dpsim/" \
org.label-schema.vcs-url = "https://git.rwth-aachen.de/acs/core/simulation/DPsim"
ADD https://villas.fein-aachen.org/packages/villas.repo /etc/yum.repos.d/ ADD https://villas.fein-aachen.org/packages/villas.repo /etc/yum.repos.d/
RUN dnf -y update RUN dnf -y update
# Toolchain
RUN dnf -y install \ RUN dnf -y install \
git \ git \
gcc-c++ \ gcc-c++ \
make \ make cmake \
cmake \ doxygen
# Dependencies
RUN dnf -y install \
eigen3-devel \ eigen3-devel \
doxygen \ villas-node-devel \
libxml2-devel \ libcimpp-devel
python3-pandas \
python3-numpy \
python3-sphinx
RUN dnf -y install villas-node-devel # Python Packages
RUN pip install \
pandas \
numpy \
matplotlib \
sphinx
Supports Markdown
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