commit b42fabfa95dd6262539ec759877ad936db6303d3
Author: Elan Ruusamäe <[email protected]>
Date: Mon Oct 24 11:55:37 2016 +0300
up to 1.7.0
branch-preserver.patch | 6 +++---
gitlab-ci-multi-runner.spec | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index b3255c0..d348e47 100644
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -10,12 +10,12 @@
%define revision 1.5.2
Summary: The official GitLab CI runner written in Go
Name: gitlab-ci-multi-runner
-Version: 1.6.0
+Version: 1.7.0
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: 397bc6a197942495d0a5582996f91c3e
+# Source0-md5: 1a81de7b78196befce0b16f1dfa06fca
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
diff --git a/branch-preserver.patch b/branch-preserver.patch
index 61b400c..40e18d2 100644
--- a/branch-preserver.patch
+++ b/branch-preserver.patch
@@ -1,10 +1,10 @@
----
gitlab-ci-multi-runner-1.6.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells/abstract.go~
2016-09-22 20:36:49.000000000 +0300
-+++
gitlab-ci-multi-runner-1.6.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells/abstract.go
2016-10-24 11:05:20.385999188 +0300
+---
gitlab-ci-multi-runner-1.7.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells/abstract.go~
2016-10-21 23:19:09.000000000 +0300
++++
gitlab-ci-multi-runner-1.7.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells/abstract.go
2016-10-24 11:51:14.842526005 +0300
@@ -99,7 +99,7 @@
func (b *AbstractShell) writeCheckoutCmd(w ShellWriter, build *common.Build) {
w.Notice("Checking out %s as %s...", build.Sha[0:8], build.RefName)
-- w.Command("git", "checkout", "-q", build.Sha)
+- w.Command("git", "checkout", "-f", "-q", build.Sha)
+ w.Command("git", "checkout", "-fq", "-B", build.RefName, build.Sha)
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ci-multi-runner.git/commitdiff/b42fabfa95dd6262539ec759877ad936db6303d3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
