up to 1.9.0

diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index eec6e8e007ab8ce71faac6a11d1065a3606e7f8a..f1ff41536bfa2463e05571a824493feee570a783 100644 (file)
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -1,12 +1,11 @@
 Summary:       The official GitLab CI runner written in Go
 Name:          gitlab-ci-multi-runner
 Version:       1.9.0
-Release:       0.1
+Release:       1
 License:       MIT
 Group:         Development/Building
-%define        subver  -rc.4
-Source0:       https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/repository/archive.tar.gz?ref=v%{version}%{subver}&/%{name}-%{version}%{subver}.tar.gz
-# Source0-md5: 8422126d27e4b98beb11a6969e08042a
+Source0:       https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/repository/archive.tar.gz?ref=v%{version}&/%{name}-%{version}.tar.gz
+# Source0-md5: cfa0ed3dec9b5a024ed1d885d2551ba6
 Source3:       %{name}.init
 Source4:       %{name}.sysconfig
 Source5:       %{name}.service

diff --git a/nodim_gz.patch b/nodim_gz.patch
index 78edd99e9d6ba7c8c4b957a3f201c453ae3fa951..b23df7a989381e68ec75f1f35bbc98b5ed0ae0c4 100644 (file)
--- a/nodim_gz.patch
+++ b/nodim_gz.patch
@@ -4,9 +4,9 @@ Bug-Upstream: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1504
 Author: Dmitry Smirnov <onlyjob@debian.org>
 Description: do not incorporate Docker image into executable.
 
---- gitlab-ci-multi-runner/executors/docker/executor_docker.go~        2016-09-22 20:36:49.000000000 +0300
-+++ gitlab-ci-multi-runner/executors/docker/executor_docker.go 2016-09-22 22:46:50.385436324 +0300
-@@ -181,17 +181,11 @@
+--- gitlab-ci-multi-runner/executors/docker/executor_docker.go~        2016-12-22 16:21:38.000000000 +0200
++++ gitlab-ci-multi-runner/executors/docker/executor_docker.go 2016-12-23 14:41:59.425571451 +0200
+@@ -208,17 +208,11 @@
                return
        }
  
@@ -17,8 +17,8 @@ Description: do not incorporate Docker image into executable.
 -
        s.Debugln("Loading prebuilt image...")
        err = s.client.ImportImage(docker.ImportImageOptions{
-               Repository:  prebuiltImageName + "-" + architecture,
-               Tag:         common.REVISION,
+               Repository:  prebuiltImageName,
+               Tag:         architecture + "-" + common.REVISION,
 -              Source:      "-",
 -              InputStream: bytes.NewBuffer(data),
 +              Source:      "/var/lib/gitlab-runner/prebuilt-" + architecture + ".tar.xz",