X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gitlab-ci-multi-runner.spec;h=fab8bbd4a356f2aa7621d439d9dd418d6c520e51;hb=b5ede9e6a305c94790752ff01e52e7669555036c;hp=9d6714818dfe615e864ff745680431c28abd15e8;hpb=4ffe17359b22915ab4ef3c48f1c313192c253f97;p=packages%2Fgitlab-runner.git

diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index 9d67148..fab8bbd 100644
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -1,27 +1,46 @@
 Summary:	The official GitLab CI runner written in Go
 Name:		gitlab-ci-multi-runner
-Version:	1.1.0
+Version:	1.8.0
 Release:	1
-License:	GPL v3
+License:	MIT
 Group:		Development/Building
 Source0:	https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/repository/archive.tar.gz?ref=v%{version}&/%{name}-%{version}.tar.gz
-# Source0-md5:	4145931bc59d40e32df6ee24e15a19d3
-Source1:	https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt.tar.gz
-# Source1-md5:	d616dcc457a6ce69bed4af2ca08dfe0a
+# Source0-md5:	aed7c89fb2d0fa9c61c97d0206cc048b
+Source3:	%{name}.init
+Source4:	%{name}.sysconfig
+Source5:	%{name}.service
+Patch0:		nodim_gz.patch
+Patch1:		branch-preserver.patch
 URL:		https://gitlab.com/gitlab-org/gitlab-ci-multi-runner
 BuildRequires:	git-core
-BuildRequires:	go-bindata >= 3.0.7-1.a0ff2567
-BuildRequires:	golang
+BuildRequires:	golang >= 1.6
+BuildRequires:	rpmbuild(macros) >= 1.647
+Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun,postun):	systemd-units >= 38
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires:	bash
 Requires:	ca-certificates
-Requires:	curl
 Requires:	git-core
+Requires:	rc-scripts
+Requires:	systemd-units >= 0.38
 Requires:	tar
+Suggests:	docker >= 1.8
+Suggests:	gitlab-ci-multi-runner-image-arm
+Suggests:	gitlab-ci-multi-runner-image-x86_64
+Provides:	group(gitlab-runner)
+Provides:	user(gitlab-runner)
 ExclusiveArch:	%{ix86} %{x8664} %{arm}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # go stuff
 %define _enable_debug_packages 0
 %define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**};
+%define import_path	gitlab.com/gitlab-org/gitlab-ci-multi-runner
 
 %description
 This is the official GitLab Runner written in Go. It runs tests and
@@ -30,29 +49,88 @@ integration service included with GitLab that coordinates the testing.
 
 %prep
 %setup -qc
-mv gitlab-ci-multi-runner-*/{.??*,*} .
 
-install -d Godeps/_workspace/src/gitlab.com/gitlab-org
-ln -s ../../../../.. Godeps/_workspace/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner
+# for doc
+mv gitlab-ci-multi-runner-*/*.md .
 
-mkdir -p out/docker
-ln -s %{SOURCE1} out/docker/prebuilt.tar.gz
+# don't you love go?
+install -d src/$(dirname %{import_path})
+mv gitlab-ci-multi-runner-* src/%{import_path}
+cd src/%{import_path}
+
+%patch0 -p1
+%patch1 -p1
+
+# avoid docker being used even if executable found
+cat <<'EOF' > docker
+#!/bin/sh
+echo >&2 "No docker"
+exit 1
+EOF
+chmod a+rx docker
 
 %build
-export GOPATH=$(pwd):$(pwd)/Godeps/_workspace
+export GOPATH=$(pwd)
+cd src/%{import_path}
+export PATH=$(pwd):$PATH
+
+%{__make} version | tee version.txt
 
-%{__make} docker
+CN=gitlab.com/gitlab-org/gitlab-ci-multi-runner/common
+LDFLAGS="-X $CN.NAME=gitlab-ci-multi-runner -X $CN.VERSION=%{version} -X $CN.REVISION=%{version}"
 %gobuild
 
+# verify that version matches
+./gitlab-ci-multi-runner -v > v
+v=$(awk '$1 == "Version:" {print $2}' v)
+test "$v" = "%{version}"
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -p %{name}-%{version} $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/gitlab-runner,%{_bindir},/etc/{rc.d/init.d,sysconfig},%{systemdunitdir},/var/lib/gitlab-runner/.gitlab-runner}
+
+install -p src/%{import_path}/%{name} $RPM_BUILD_ROOT%{_bindir}/gitlab-runner
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}
+
+# backward compat name for previous pld packaging
+ln -s gitlab-runner $RPM_BUILD_ROOT%{_bindir}/gitlab-ci-multi-runner
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+%groupadd -g 330 gitlab-runner
+%useradd -u 330 -d /var/lib/gitlab-runner -g gitlab-runner -c "GitLab Runner" gitlab-runner
+
+%postun
+if [ "$1" = "0" ]; then
+	%userremove gitlab-runner
+	%groupremove gitlab-runner
+fi
+%systemd_reload
+
+%post
+/sbin/chkconfig --add %{name}
+%service %{name} restart
+%systemd_post %{name}.service
+
+%preun
+if [ "$1" = "0" ]; then
+	%service -q %{name} stop
+	/sbin/chkconfig --del %{name}
+fi
+%systemd_preun %{name}.service
+
 %files
 %defattr(644,root,root,755)
 %doc README.md CHANGELOG.md
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gitlab-ci-multi-runner
+%attr(754,root,root) /etc/rc.d/init.d/gitlab-ci-multi-runner
+%dir %attr(750,root,root) %{_sysconfdir}/gitlab-runner
 %attr(755,root,root) %{_bindir}/gitlab-ci-multi-runner
+%attr(755,root,root) %{_bindir}/gitlab-runner
+%{systemdunitdir}/gitlab-ci-multi-runner.service
+%dir %attr(750,gitlab-runner,gitlab-runner) /var/lib/gitlab-runner
+%dir %attr(750,gitlab-runner,gitlab-runner) /var/lib/gitlab-runner/.gitlab-runner