[arch-commits] Commit in gitlab-ci-multi-runner/trunk (PKGBUILD godeps.patch)

[Sven-Hendrik Haase]

    Date: Friday, September 2, 2016 @ 19:08:12
  Author: svenstaro
Revision: 188315

upgpkg: gitlab-ci-multi-runner 1.5.2-1

upstream release 1.5.2

Modified:
  gitlab-ci-multi-runner/trunk/PKGBUILD
  gitlab-ci-multi-runner/trunk/godeps.patch

--------------+
 PKGBUILD     |   28 ++++++++++++++--------------
 godeps.patch |   39 ++++++++++++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-02 17:24:51 UTC (rev 188314)
+++ PKGBUILD	2016-09-02 19:08:12 UTC (rev 188315)
@@ -2,7 +2,7 @@
 # Contributor: Lubomir 'Kuci' Kucera <kuci24-at-gmail-dot-com>
 
 pkgname=gitlab-ci-multi-runner
-pkgver=1.4.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="The official GitLab CI runner written in Go"
 arch=('i686' 'x86_64')
@@ -12,11 +12,11 @@
 makedepends=('git' 'go' 'godep' 'go-bindata' 'mercurial')
 install='gitlab-runner.install'
 backup=('etc/gitlab-runner/config.toml')
-noextract=('prebuilt-x86_64.tar.gz'
-           'prebuilt-arm.tar.gz')
+noextract=('prebuilt-x86_64.tar.xz'
+           'prebuilt-arm.tar.xz')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/repository/archive.tar.gz?ref=v${pkgver}"
-        "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${pkgver}/docker/prebuilt-x86_64.tar.gz"
-        "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${pkgver}/docker/prebuilt-arm.tar.gz"
+        "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${pkgver}/docker/prebuilt-x86_64.tar.xz"
+        "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${pkgver}/docker/prebuilt-arm.tar.xz"
         "gitlab-runner.install"
         "gitlab-runner.service"
         "gitlab-runner.sysusers"
@@ -23,15 +23,15 @@
         "gitlab-runner.tmpfiles"
         "config.toml"
         "godeps.patch")
-sha256sums=('3e1110aa1b885b54c8bfddaac1ea295fd72856ee0d40174fd1d539851b0fcff0'
-            '8f4218c357ae8e34a81ed3a4d86e4a24ede2295e71edf659282fd4a4badbada7'
-            '9a07b6085e48867af761b6c4e265f803f8a30175574e323e5f3593de9a59707a'
+sha256sums=('fbade53f2603187207fc7a58b8dc8fcdc5c089c8405cc136edbc715079caad19'
+            '265a49a8ecb5a4ca3fe51c66baca2a8e82608e37fbe487e261bfe72d83dc5902'
+            '951b4ee84fcab0c63e80d70fe78774a32eb96bff65266417d4f6e4aeb8fe7e64'
             '289f73a16df5c8823a15b67a4aaa635d32b9c49ce4e11baa5d33f12828a1e0bb'
             '843cabc4e1cfbf0a81365abae0c3d6ac388c00074017f9c286a7d5545828d1fa'
             '0d7621aec132ce44d7dadbe6c5f43b330af5c1dddfe06c958336a297e70c5bba'
             '8b17ed458da6926ea0d28aa4cb307b42b047bda9dfa4a96ee48e1c02051efb13'
             'b1f7d9a6a0148884528584909729cce817253759650da61d641e2225845f9330'
-            'ec91955d60f3127237651050dc6cc64e5dfb8efb9485d514b301c558b16a1834')
+            'e75aafe94fe0029e42267e459a1c2d1edae1c3f8d4914af353fc005fef74a828')
 
 prepare() {
     _srcdir=$(ls "${srcdir}" | grep -E "${pkgname}-v${pkgver}-[0-9a-f]{40}")
@@ -42,13 +42,13 @@
 
     cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}"
 
-    # Patch invalid revisions in Godeps/Godeps.json
+    # Patch invalid windows packages in Godeps/Godeps.json
     patch -p0 -i "${srcdir}/godeps.patch"
 
     GOPATH="${srcdir}" godep restore
 
-    ln -sf "${srcdir}/prebuilt-x86_64.tar.gz" prebuilt-x86_64.tar.gz
-    ln -sf "${srcdir}/prebuilt-x86_64.tar.gz" prebuilt-arm.tar.gz
+    ln -sf "${srcdir}/prebuilt-x86_64.tar.xz" prebuilt-x86_64.tar.xz
+    ln -sf "${srcdir}/prebuilt-x86_64.tar.xz" prebuilt-arm.tar.xz
 }
 
 build() {
@@ -62,8 +62,8 @@
         -nomemcopy \
         -prefix out/docker/ \
         -o executors/docker/bindata.go \
-        prebuilt-x86_64.tar.gz \
-        prebuilt-arm.tar.gz
+        prebuilt-x86_64.tar.xz \
+        prebuilt-arm.tar.xz
 
     GOPATH="${srcdir}" go build \
         -ldflags "-X main.NAME=${pkgname} -X main.VERSION=${pkgver} -X main.REVISION=${_rev}"

Modified: godeps.patch
===================================================================
--- godeps.patch	2016-09-02 17:24:51 UTC (rev 188314)
+++ godeps.patch	2016-09-02 19:08:12 UTC (rev 188315)
@@ -1,13 +1,30 @@
---- Godeps/Godeps.json	2016-04-09 15:04:51.001129590 +0200
-+++ Godeps/Godeps.json	2016-04-09 15:05:24.610572211 +0200
-@@ -7,8 +7,8 @@
- 	"Deps": [
- 		{
- 			"ImportPath": "github.com/BurntSushi/toml",
--			"Comment": "v0.1.0-24-gffbe061",
--			"Rev": "ffbe061dbf09df6f4d404ef06736cc2b9e2510f7"
-+			"Comment": "v0.2.0",
-+			"Rev": "bbd5bb678321a0d6e58f1099321dfa73391c1b6f"
+--- Godeps/Godeps.json	2016-08-22 16:43:27.000000000 +0200
++++ Godeps/Godeps.json	2016-09-02 14:07:53.703466326 +0200
+@@ -153,26 +153,6 @@
+ 			"Rev": "1f22c0103821b9390939b6776727195525381532"
  		},
  		{
- 			"ImportPath": "github.com/Sirupsen/logrus",
+-			"ImportPath": "golang.org/x/sys/windows",
+-			"Rev": "98fc11432b951eb53c62602ba4ae99d03c1fb7e2"
+-		},
+-		{
+-			"ImportPath": "golang.org/x/sys/windows/registry",
+-			"Rev": "98fc11432b951eb53c62602ba4ae99d03c1fb7e2"
+-		},
+-		{
+-			"ImportPath": "golang.org/x/sys/windows/svc",
+-			"Rev": "98fc11432b951eb53c62602ba4ae99d03c1fb7e2"
+-		},
+-		{
+-			"ImportPath": "golang.org/x/sys/windows/svc/eventlog",
+-			"Rev": "98fc11432b951eb53c62602ba4ae99d03c1fb7e2"
+-		},
+-		{
+-			"ImportPath": "golang.org/x/sys/windows/svc/mgr",
+-			"Rev": "98fc11432b951eb53c62602ba4ae99d03c1fb7e2"
+-		},
+-		{
+ 			"ImportPath": "gopkg.in/yaml.v1",
+ 			"Rev": "9f9df34309c04878acc86042b16630b0f696e1de"
+ 		}
+