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

diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index 9d67148..f32f132 100644
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -1,21 +1,35 @@
+# the revision for images
+%define	revision	%{version}
 Summary:	The official GitLab CI runner written in Go
 Name:		gitlab-ci-multi-runner
-Version:	1.1.0
+Version:	1.4.1
 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:	e24a5ba8093d779e0ce604ae2f4583d8
+Source1:	https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-x86_64.tar.gz
+# Source1-md5:	56701d9092b076647308fe70e0752645
+Source2:	https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-arm.tar.gz
+# Source2-md5:	142cfeb6b29dad3a61e2e9c13951b331
 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.4
+BuildRequires:	rpmbuild(macros) >= 1.202
+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:	ca-certificates
 Requires:	curl
 Requires:	git-core
 Requires:	tar
+Suggests:	docker >= 1.5.0
+Provides:	group(gitlab-runner)
+Provides:	user(gitlab-runner)
 ExclusiveArch:	%{ix86} %{x8664} %{arm}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,23 +50,80 @@ install -d Godeps/_workspace/src/gitlab.com/gitlab-org
 ln -s ../../../../.. Godeps/_workspace/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner
 
 mkdir -p out/docker
-ln -s %{SOURCE1} out/docker/prebuilt.tar.gz
+ln -s %{SOURCE1} out/docker
+ln -s %{SOURCE2} out/docker
+# touch, otherwise make rules would download it nevertheless
+touch out/docker/prebuilt-*.tar.gz
+
+# avoid docker being used even if executable found
+cat <<'EOF' > docker
+#!/bin/sh
+echo >&2 "No docker"
+exit 1
+EOF
+chmod a+rx docker
+
+ln -s /bin/true golint
+ln -s /bin/true gocyclo
+ln -s /bin/true vet
+ln -s /bin/true gox
 
 %build
+# check that the revision is correct
+#tar xvf out/docker/prebuilt.tar.gz repositories
+#revision=$(sed -rne 's/.*"gitlab-runner-build":\{"([^"]+)":.*/\1/p' repositories)
+#test "$revision" = %{revision}
+
 export GOPATH=$(pwd):$(pwd)/Godeps/_workspace
+export PATH=$(pwd):$PATH
 
 %{__make} docker
+%{__make} version | tee version.txt
+# GO_LDFLAGS ?= -X $(COMMON_PACKAGE_NAMESPACE).NAME=$(PACKAGE_NAME) -X $(COMMON_PACKAGE_NAMESPACE).VERSION=$(VERSION) \
+#              -X $(COMMON_PACKAGE_NAMESPACE).REVISION=$(REVISION) -X $(COMMON_PACKAGE_NAMESPACE).BUILT=$(BUILT) \
+#              -X $(COMMON_PACKAGE_NAMESPACE).BRANCH=$(BRANCH)
+
+go get github.com/Sirupsen/logrus
+
+%{__make}
+exit 3
+%{__make} build_simple
+exit 1
+LDFLAGS="-X main.NAME gitlab-ci-multi-runner -X main.VERSION %{version} -X main.REVISION %{revision}"
 %gobuild
 
+# verify that version matches
+./gitlab-ci-multi-runner-%{version} -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},/var/lib/gitlab-runner/.gitlab-runner}
+
+install -p %{name}-%{version} $RPM_BUILD_ROOT%{_bindir}/gitlab-runner
+
+# 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
+
 %files
 %defattr(644,root,root,755)
 %doc README.md CHANGELOG.md
+%dir %attr(750,root,root) %{_sysconfdir}/gitlab-runner
 %attr(755,root,root) %{_bindir}/gitlab-ci-multi-runner
+%attr(755,root,root) %{_bindir}/gitlab-runner
+%dir %attr(750,gitlab-runner,gitlab-runner) /var/lib/gitlab-runner
+%dir %attr(750,gitlab-runner,gitlab-runner) /var/lib/gitlab-runner/.gitlab-runner