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

fix some problems with GitLab CI deployment

Browse source
This commit is contained in:
Steffen Vogel 2017-04-06 15:04:47 +02:00
parent 047ddde0c4
commit bfad9ff397
4 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitlab-ci.yml
View file

@ -1,5 +1,8 @@
variables: variables:
GIT_STRATEGY: clone
GIT_SUBMODULE_STRATEGY: recursive
PREFIX: /usr/ PREFIX: /usr/
RSYNC_OPTS: --recursive --ignore-missing-args --chown $DEPLOY_USER:$DEPLOY_USER
stages: stages:
- prepare - prepare
@ -15,8 +18,6 @@ docker-dev:
stage: prepare stage: prepare
before_script: before_script:
- docker info - docker info
- git submodule sync --recursive
- git submodule update --init --recursive
script: script:
- docker pull fedora:latest - docker pull fedora:latest
- make docker-dev - make docker-dev
@ -150,8 +151,9 @@ website:
deliver: deliver:
stage: deploy stage: deploy
script: script:
- rsync --recursive --ignore-missing-args build/release-coverage/coverage/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/coverage/$CI_BUILD_REF_NAME/ - ssh $DEPLOY_USER@$DEPLOY_HOST mkdir -pf $DEPLOY_PATH/{coverage,doc}/$CI_BUILD_REF_NAME/
- rsync --recursive --ignore-missing-args build/release/doc/html/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/doc/$CI_BUILD_REF_NAME/ - rsync $RSYNC_OPTS build/release-coverage/coverage/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/coverage/$CI_BUILD_REF_NAME/
- rsync $RSYNC_OPTS build/release/doc/html/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/doc/$CI_BUILD_REF_NAME/
dependencies: dependencies:
- docs - docs
- coverage - coverage
@ -162,8 +164,9 @@ deliver:
deliver-packages: deliver-packages:
stage: deploy stage: deploy
script: script:
- rsync --recursive --ignore-missing-args build/release/packaging/rpm/RPMS/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/../packages/ - ssh $DEPLOY_USER@$DEPLOY_HOST mkdir -p $DEPLOY_PATH/{dist,../packages}
- rsync --ignore-missing-args build/release/packaging/*.tar.gz $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/dist/ - rsync $RSYNC_OPTS build/release/packaging/rpm/RPMS/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/../packages/
- rsync $RSYNC_OPTS build/release/packaging/*.tar.gz $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/dist/
- ssh $DEPLOY_USER@$DEPLOY_HOST createrepo $DEPLOY_PATH/../packages - ssh $DEPLOY_USER@$DEPLOY_HOST createrepo $DEPLOY_PATH/../packages
dependencies: dependencies:
- packages - packages

2
.gitmodules vendored
View file

@ -21,4 +21,4 @@
url = https://github.com/curl/curl.git url = https://github.com/curl/curl.git
[submodule "thirdparty/libxil"] [submodule "thirdparty/libxil"]
path = thirdparty/libxil path = thirdparty/libxil
url = git@git.rwth-aachen.de:VILLASframework/libxil.git url = ../libxil.git

17
Dockerfile.dev
View file

@ -18,18 +18,16 @@ MAINTAINER Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# Toolchain # Toolchain
RUN dnf -y update && \ RUN dnf -y update && \
dnf -y install \ dnf -y install \
gcc pkgconfig make cmake \ gcc gcc-c++ \
git \ pkgconfig make cmake \
gcc-c++ \
autoconf automake autogen libtool \ autoconf automake autogen libtool \
flex bison \ flex bison \
texinfo texinfo git
# Dependencies # Dependencies
RUN dnf -y update && \ RUN dnf -y update && \
dnf -y install \ dnf -y install \
openssl \ openssl openssl-devel \
openssl-devel \
libconfig-devel \ libconfig-devel \
libnl3-devel \ libnl3-devel \
libcurl-devel \ libcurl-devel \
@ -38,12 +36,9 @@ RUN dnf -y update && \
# Several tools only needed for developement and testing # Several tools only needed for developement and testing
RUN dnf -y update && \ RUN dnf -y update && \
dnf -y install \ dnf -y install \
doxygen \ doxygen dia graphviz \
dia \
graphviz \
openssh-clients \ openssh-clients \
rpmdevtools \ rpmdevtools rpm-build \
rpm-build \
jq \ jq \
iproute \ iproute \
python-pip \ python-pip \

2
thirdparty/libwebsockets vendored

@ -1 +1 @@
Subproject commit 42b2334c5c4b1b3da5dd75bd92451bb49983c236 Subproject commit 2b9fff73f92dfe1ea5fde9a11e75f3ef2a981f90