Commit 52afa5dc authored by Paul Cammish's avatar Paul Cammish
Browse files

Import gitlab-ci fix from...

Import gitlab-ci fix from https://gitlab.com/lupine/symbiosis/commit/ab442a878133793037bcd6a6d1519c9c98d72e4a
parent 30784a9e
...@@ -6,12 +6,15 @@ stages: ...@@ -6,12 +6,15 @@ stages:
.test: &test .test: &test
stage: test stage: test
image: $CI_REGISTRY/docker-images/layers:stretch-ruby image: debian:stretch
script: script:
- apt-get update && apt-get install -q -yy rake devscripts rdoc graphviz ruby-dev
- curl -L https://secure.bytemark.co.uk/key/repositories-2006.key | apt-key add -
- curl -L https://secure.bytemark.co.uk/key/repositories-2014.key | apt-key add -
- adduser --home=/srv --shell=/bin/bash --no-create-home --disabled-login --gecos='Symbiosis Administrator,,,' admin - adduser --home=/srv --shell=/bin/bash --no-create-home --disabled-login --gecos='Symbiosis Administrator,,,' admin
- chown admin.admin /srv - chown admin.admin /srv
- cp test/internal-test.d/conf-stretch/sources.list /etc/apt/sources.list.d/ - cp test/internal-test.d/conf-stretch/sources.list /etc/apt/sources.list.d/
- "[ -z \"$TEST_DEPS\" ] || (apt-get update ; apt-get install $TEST_DEPS)" - "[ -z \"$TEST_DEPS\" ] || (apt-get update ; apt-get install -q -yy $TEST_DEPS)"
- export PACKAGE=${CI_BUILD_NAME##test:} - export PACKAGE=${CI_BUILD_NAME##test:}
- cd $PACKAGE - cd $PACKAGE
- "[ ! -f Makefile ] || make test" - "[ ! -f Makefile ] || make test"
...@@ -80,15 +83,20 @@ test:xmpp: ...@@ -80,15 +83,20 @@ test:xmpp:
<<: *test <<: *test
.package: &package .package: &package
image: $CI_REGISTRY/docker-images/layers:stretch-deb image: debian:stretch
stage: package stage: package
script: script:
- cp symbiosis.list /etc/apt/sources.list.d/ - apt-get update && apt-get install -q -yy rake devscripts rdoc graphviz ruby-dev
- apt-get update - curl -L https://secure.bytemark.co.uk/key/repositories-2006.key | apt-key add -
- curl -L https://secure.bytemark.co.uk/key/repositories-2014.key | apt-key add -
- apt-get update && apt-get install -q -yy gem2deb txt2man dh-systemd apache2-dev libcap-dev php7.0-common dh-golang golang-go
- export PACKAGE=${CI_BUILD_NAME##package:} - export PACKAGE=${CI_BUILD_NAME##package:}
- echo "$CI_BUILD_NAME" - "$PACKAGE" - "${CI_BUILD_NAME##package:}" - echo "$CI_BUILD_NAME" - "$PACKAGE" - "${CI_BUILD_NAME##package:}"
- cd $PACKAGE - cd $PACKAGE
- package - dpkg-buildpackage --no-sign --build=full
- cd ..
- mkdir pkg
- mv $(git ls-files --others -x '*/') pkg
artifacts: artifacts:
paths: paths:
- pkg/ - pkg/
...@@ -126,14 +134,17 @@ package:webmail: ...@@ -126,14 +134,17 @@ package:webmail:
package:xmpp: package:xmpp:
<<: *package <<: *package
# We publish to an artifact that should be usable as a Debian repository as-is
publish: publish:
image: debian:stretch
stage: publish stage: publish
variables:
RSYNC_HOSTNAME: repo.bytemark.co.uk
tags:
- shell
script: script:
- publish - apt-get update && apt-get install -q -yy dpkg-dev
- dpkg-scanpackages pkg > pkg/Packages
- gzip -k pkg/Packages
artifacts:
paths:
- pkg/*
# fails on stretch for the time being - see issue #57 for updates # fails on stretch for the time being - see issue #57 for updates
.install: &install .install: &install
...@@ -192,6 +203,7 @@ publish: ...@@ -192,6 +203,7 @@ publish:
variables: &installvars variables: &installvars
DEBIAN_RELEASE: stretch DEBIAN_RELEASE: stretch
OLD_DEBIAN_RELEASE: jessie OLD_DEBIAN_RELEASE: jessie
when: manual
install:fresh-install: install:fresh-install:
<<: *install <<: *install
......
2019-04-16 - Fixed Gitlab CI
2019-04-13 - Initial fork from GitHub
...@@ -12,7 +12,7 @@ Building The Packages ...@@ -12,7 +12,7 @@ Building The Packages
The minimum packages needed to get the build process working are: The minimum packages needed to get the build process working are:
rake devscripts rdoc graphviz rake devscripts rdoc graphviz ruby-dev
You should be able to build all packages via : You should be able to build all packages via :
......
...@@ -3,7 +3,7 @@ Section: mail ...@@ -3,7 +3,7 @@ Section: mail
Priority: extra Priority: extra
Maintainer: James Carter <jcarter@bytemark.co.uk> Maintainer: James Carter <jcarter@bytemark.co.uk>
Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk> Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk>
Build-Depends: debhelper (>= 7.0.0), txt2man, gem2deb, dh-systemd, symbiosis-common Build-Depends: debhelper (>= 7.0.0), txt2man, gem2deb, dh-systemd
Standards-Version: 3.9.6 Standards-Version: 3.9.6
XS-Ruby-Versions: all XS-Ruby-Versions: all
......
...@@ -3,7 +3,7 @@ Section: web ...@@ -3,7 +3,7 @@ Section: web
Priority: optional Priority: optional
Maintainer: James Carter <jcarter@bytemark.co.uk> Maintainer: James Carter <jcarter@bytemark.co.uk>
Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk> Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk>
Build-Depends: debhelper (>= 7.0.0), apache2-dev, libcap-dev, php7.0-common, txt2man, gem2deb, ruby, symbiosis-common, dh-golang, golang-go (>= 1.5.1) Build-Depends: debhelper (>= 7.0.0), apache2-dev, libcap-dev, php7.0-common, txt2man, gem2deb, ruby, dh-golang, golang-go (>= 1.5.1)
Standards-Version: 3.9.6 Standards-Version: 3.9.6
XS-Ruby-Versions: all XS-Ruby-Versions: all
......
...@@ -3,7 +3,7 @@ Section: net ...@@ -3,7 +3,7 @@ Section: net
Priority: extra Priority: extra
Maintainer: James Carter <jcarter@bytemark.co.uk> Maintainer: James Carter <jcarter@bytemark.co.uk>
Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk> Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>, Steve Kemp <steve@bytemark.co.uk>
Build-Depends: debhelper (>= 7.0.0), gem2deb, txt2man, symbiosis-common Build-Depends: debhelper (>= 7.0.0), gem2deb, txt2man
Standards-Version: 3.9.6 Standards-Version: 3.9.6
XS-Ruby-Versions: all XS-Ruby-Versions: all
......
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