up to 1.7.1

[packages/gitlab-runner.git] / gitlab-ci-multi-runner.spec

diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index d74f60a81e36cab02017e2380d8836e32fba1eb9..8ba9fb959c86758284dd670fd4639ab539b90549 100644 (file)
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -1,20 +1,30 @@
+#
+# Conditional build:
+%bcond_with    bindata         # embed docker images to binary (upstream compatible)
+
 # the revision for images
-%define        revision        %{version}
+# $ git fetch https://gitlab.com/gitlab-org/gitlab-ci-multi-runner refs/tags/v1.6.0
+# $ git rev-list -n 1 --abbrev-commit FETCH_HEAD
+#define revision 76fdacd
+# No changes to image, so don't refetch it
+%define revision 1.5.2
 Summary:       The official GitLab CI runner written in Go
 Name:          gitlab-ci-multi-runner
-Version:       1.5.2
+Version:       1.7.1
 Release:       1
 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: 3daf43173c38421fb9243fc20a7adf70
+# Source0-md5: ffc78abf7e8aa4aef2778aea14d5e6a0
 Source1:       https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-x86_64.tar.xz
 # Source1-md5: 0d89c7578a0b5d22a4ae85dcb7d5b4f5
 Source2:       https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-arm.tar.xz
 # Source2-md5: c0533c581624dcb33095f08f06e6a00b
+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
+%{?with_bindata:BuildRequires: go-bindata >= 3.0.7-1.a0ff2567}
 BuildRequires: golang >= 1.4
 BuildRequires: rpmbuild(macros) >= 1.202
 Requires(postun):      /usr/sbin/groupdel
@@ -23,11 +33,12 @@ 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:      tar
-Suggests:      docker >= 1.5.0
+Suggests:      docker >= 1.8
 Provides:      group(gitlab-runner)
 Provides:      user(gitlab-runner)
 ExclusiveArch: %{ix86} %{x8664} %{arm}
@@ -54,11 +65,16 @@ install -d src/$(dirname %{import_path})
 mv gitlab-ci-multi-runner-* src/%{import_path}
 cd src/%{import_path}
 
-mkdir -p out/docker
+%{!?with_bindata:%patch0 -p1}
+%patch1 -p5
+
+%if %{with bindata}
+install -d out/docker
 ln -s %{SOURCE1} out/docker
 ln -s %{SOURCE2} out/docker
 # touch, otherwise make rules would download it nevertheless
 touch out/docker/prebuilt-*.tar.xz
+%endif
 
 # avoid docker being used even if executable found
 cat <<'EOF' > docker
@@ -69,18 +85,16 @@ EOF
 chmod a+rx docker
 
 %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)
 cd src/%{import_path}
 export PATH=$(pwd):$PATH
 
+%if %{with bindata}
 # build docker bindata. if you forget this, you get such error:
 # executors/docker/executor_docker.go:180: undefined: Asset
 %{__make} docker
+%endif
+
 %{__make} version | tee version.txt
 
 CN=gitlab.com/gitlab-org/gitlab-ci-multi-runner/common
@@ -101,6 +115,11 @@ install -p src/%{import_path}/%{name} $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
 
+%if %{without bindata}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/var/lib/gitlab-runner
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/var/lib/gitlab-runner
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -122,3 +141,8 @@ fi
 %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
+
+%if %{without bindata}
+/var/lib/gitlab-runner/prebuilt-arm.tar.xz
+/var/lib/gitlab-runner/prebuilt-x86_64.tar.xz
+%endif