From 68184017a1fe4e68c40196cc4c25d3f1f97f0463 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 6 Sep 2021 17:18:16 +0300
Subject: [PATCH] Up to 13.12.0

---
 branch-preserver.patch | 8 ++++----
 gitlab-runner.spec     | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/branch-preserver.patch b/branch-preserver.patch
index e47cbcf..49175c3 100644
--- a/branch-preserver.patch
+++ b/branch-preserver.patch
@@ -1,9 +1,9 @@
---- gitlab-runner/shells/abstract.go~	2019-10-28 14:11:26.000000000 +0200
-+++ gitlab-runner/shells/abstract.go	2019-11-10 02:47:02.568781451 +0200
-@@ -337,7 +337,11 @@
+--- gitlab-runner-13.12.0/src/gitlab.com/gitlab-org/gitlab-runner/shells/abstract.go~	2021-05-20 18:01:08.000000000 +0300
++++ gitlab-runner-13.12.0/src/gitlab.com/gitlab-org/gitlab-runner/shells/abstract.go	2021-09-06 17:21:01.502430880 +0300
+@@ -386,7 +386,11 @@
  
  func (b *AbstractShell) writeCheckoutCmd(w ShellWriter, build *common.Build) {
- 	w.Notice("Checking out %s as %s...", build.GitInfo.Sha[0:8], build.GitInfo.Ref)
+ 	w.Noticef("Checking out %s as %s...", build.GitInfo.Sha[0:8], build.GitInfo.Ref)
 -	w.Command("git", "checkout", "-f", "-q", build.GitInfo.Sha)
 +	if build.GitInfo.RefType == common.RefTypeTag {
 +		w.Command("git", "checkout", "-f", "-q", build.GitInfo.Sha)
diff --git a/gitlab-runner.spec b/gitlab-runner.spec
index 7e5bbe6..9970bdc 100644
--- a/gitlab-runner.spec
+++ b/gitlab-runner.spec
@@ -5,12 +5,12 @@
 %define		helper_revision	05161b14
 Summary:	The official GitLab CI runner written in Go
 Name:		gitlab-runner
-Version:	12.7.1
+Version:	13.12.0
 Release:	1
 License:	MIT
 Group:		Development/Building
 Source0:	https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v%{version}/gitlab-runner-v%{version}.tar.bz2
-# Source0-md5:	20c0e38abbb97ba2c6bc38fd338fc15f
+# Source0-md5:	a249bfae11074f3922a6c1f72fa5fa9d
 %if %{with prebuilt}
 Source1:	https://gitlab-runner-downloads.s3.amazonaws.com/v%{version}/binaries/gitlab-runner-linux-amd64
 # Source1-md5:	2fc56f01f932a14a807e37195d08bcf2
@@ -66,10 +66,12 @@ mv gitlab-runner-*/*.md .
 # don't you love go?
 install -d src/$(dirname %{import_path})
 mv gitlab-runner-* src/%{import_path}
+
+%patch1 -p1
+
 cd src/%{import_path}
 
 #%patch0 -p5
-%patch1 -p1
 
 # avoid docker being used even if executable found
 cat <<'EOF' > docker
-- 
2.43.0