commit ac49da7736874c3a996f33b43829f1a9f4eaee61
Author: Elan Ruusamäe <[email protected]>
Date: Mon Aug 28 00:30:16 2017 +0300
fix nodim_gz patch, builds now
gitlab-ci-multi-runner.spec | 4 ++--
nodim_gz.patch | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index 9a6c76b..3a1c009 100644
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -1,7 +1,7 @@
Summary: The official GitLab CI runner written in Go
Name: gitlab-ci-multi-runner
Version: 9.5.0
-Release: 0.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
@@ -58,7 +58,7 @@ install -d src/$(dirname %{import_path})
mv gitlab-ci-multi-runner-* src/%{import_path}
cd src/%{import_path}
-#%patch0 -p1
+%patch0 -p5
%patch1 -p1
# avoid docker being used even if executable found
diff --git a/nodim_gz.patch b/nodim_gz.patch
index 5de4cb0..1dc643b 100644
--- 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 <[email protected]>
Description: do not incorporate Docker image into executable.
---- gitlab-ci-multi-runner/executors/docker/executor_docker.go~
2017-05-02 13:12:18.000000000 +0300
-+++ gitlab-ci-multi-runner/executors/docker/executor_docker.go 2017-05-16
08:08:28.042038918 +0300
-@@ -228,16 +228,11 @@
+---
gitlab-ci-multi-runner-9.5.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker/executor_docker.go
2017-08-22 16:20:43.000000000 +0300
++++
gitlab-ci-multi-runner-9.5.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker/executor_docker.go
2017-08-28 00:25:29.417833457 +0300
+@@ -222,17 +222,11 @@
return &image, nil
}
@@ -20,7 +20,8 @@ Description: do not incorporate Docker image into executable.
ref := prebuiltImageName
source := types.ImageImportSource{
- Source: bytes.NewBuffer(data),
-+ Source: "/var/lib/gitlab-runner/prebuilt-" + architecture
+ ".tar.xz",
- SourceName: "-",
+- SourceName: "-",
++ SourceName: "/var/lib/gitlab-runner/prebuilt-" + architecture +
".tar.xz",
}
options := types.ImageImportOptions{
+ Tag: architecture + "-" + common.REVISION,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ci-multi-runner.git/commitdiff/25b1e1f90f39f03c38c240222295f07b598feba8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
