Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

fix GitLab CI

Browse source
This commit is contained in:
Steffen Vogel 2017-05-01 16:57:30 +02:00
parent df99eafd51
commit 341c05bc3d
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.gitlab-ci.yml
View file

@ -10,6 +10,10 @@ stages:
- test
- deploy
# For some reason, GitLab CI prunes the contents of the submodules so we need to restore them.
before_script:
- git submodule foreach git checkout .
# Stage: prepare
##############################################################################
@ -60,6 +64,9 @@ packages:
- dnf -y --refresh install libwebsockets-devel libxil-devel
script:
- make dist
- make rpm-libwebsockets
- make rpm-libxil
- rpm -i build/release/packaging/rpm/RPMS/x86_64/*.rpm
- make rpm-villas-node
only:
- tags

2
packaging/Makefile.inc
View file

@ -25,7 +25,7 @@ TAROPTS = --exclude-ignore-recursive=.distignore --transform='s|^\.|villas-node-
TAR_VILLAS = $(BUILDDIR)/packaging/villas-node-$(VERSION_NUM)-1.$(GIT_BRANCH)_$(subst -,_,$(VARIANT)).$(shell date +%Y%m%d)git$(GIT_REV).tar.gz
DEPLOY_USER ?= root
DEPLOY_HOST ?= 188.166.166.227
DEPLOY_HOST ?= villas.fein-aachen.org
DEPLOY_PATH ?= /var/www/villas/node
DOCKER_REGISTRY ?= docker.io