[packages/gitlab-ci-multi-runner] up to 1.4.1, NFY
glen
glen at pld-linux.org
Tue Aug 23 00:22:07 CEST 2016
commit d16d4f3d8efde38d53f64d9d17e306460b82dea2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Aug 8 10:15:47 2016 +0300
up to 1.4.1, NFY
gitlab-ci-multi-runner.spec | 37 +++++++++++++++++++++++++++----------
1 file changed, 27 insertions(+), 10 deletions(-)
---
diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index 69a9a82..f32f132 100644
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -1,15 +1,17 @@
# the revision for images
-%define revision 88fc806
+%define revision %{version}
Summary: The official GitLab CI runner written in Go
Name: gitlab-ci-multi-runner
-Version: 1.2.0
+Version: 1.4.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: ca82170f56b9e334beffd664d509e5a3
-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
@@ -48,9 +50,10 @@ 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
+touch out/docker/prebuilt-*.tar.gz
# avoid docker being used even if executable found
cat <<'EOF' > docker
@@ -60,18 +63,32 @@ 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}
+#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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ci-multi-runner.git/commitdiff/a946f059d3346e5db55fb47e9d33197beb2c3d53
More information about the pld-cvs-commit
mailing list