up to 1.5.0, builds

diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index f32f132186f814da67877beb7e165f8bd3b18822..6853cb6465c986736bdffc83b01e09015530c9c9 100644 (file)
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -2,16 +2,16 @@
 %define        revision        %{version}
 Summary:       The official GitLab CI runner written in Go
 Name:          gitlab-ci-multi-runner
-Version:       1.4.1
-Release:       1
+Version:       1.5.0
+Release:       0.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: 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
+# Source0-md5: 871a304e5e601f3505c9b530dabf1511
+Source1:       https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-x86_64.tar.xz
+# Source1-md5: 0befac63ed2b43e614210a72c52bb3dc
+Source2:       https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-arm.tar.xz
+# Source2-md5: 009028115b5d9dbe11013463a056033e
 URL:           https://gitlab.com/gitlab-org/gitlab-ci-multi-runner
 BuildRequires: git-core
 BuildRequires: go-bindata >= 3.0.7-1.a0ff2567
@@ -36,6 +36,7 @@ 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
@@ -44,16 +45,20 @@ 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 .
+
+# don't you love go?
+install -d src/$(dirname %{import_path})
+mv gitlab-ci-multi-runner-* src/%{import_path}
+cd src/%{import_path}
 
 mkdir -p 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.gz
+touch out/docker/prebuilt-*.tar.xz
 
 # avoid docker being used even if executable found
 cat <<'EOF' > docker
@@ -63,37 +68,27 @@ 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 GOPATH=$(pwd)
+cd src/%{import_path}
 export PATH=$(pwd):$PATH
 
+# build docker bindata. if you forget this, you get such error:
+# executors/docker/executor_docker.go:180: undefined: Asset
 %{__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}"
+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=%{revision}"
 %gobuild
 
 # verify that version matches
-./gitlab-ci-multi-runner-%{version} -v > v
+./gitlab-ci-multi-runner -v > v
 v=$(awk '$1 == "Version:" {print $2}' v)
 test "$v" = "%{version}"
 
@@ -101,7 +96,7 @@ test "$v" = "%{version}"
 rm -rf $RPM_BUILD_ROOT
 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
+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