[arch-commits] Commit in gitlab-runner/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Tuesday, May 23, 2017 @ 17:55:28
  Author: svenstaro
Revision: 229798

upgpkg: gitlab-runner 9.2.0-2

Fix FS#53989

Modified:
  gitlab-runner/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-23 17:55:19 UTC (rev 229797)
+++ PKGBUILD	2017-05-23 17:55:28 UTC (rev 229798)
@@ -3,7 +3,7 @@
 
 pkgname=gitlab-runner
 pkgver=9.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The official GitLab CI runner written in Go"
 arch=('i686' 'x86_64')
 url='https://gitlab.com/gitlab-org/gitlab-ci-multi-runner'
@@ -40,6 +40,8 @@
     ln -sf "${srcdir}/gitlab-ci-multi-runner" "${srcdir}/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner"
     cd "${srcdir}/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner"
 
+    make version
+
     export GOPATH="${srcdir}"
     make deps
 
@@ -50,7 +52,8 @@
 build() {
     cd "${srcdir}/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner"
 
-    GOPATH="${srcdir}" go-bindata \
+    export GOPATH="${srcdir}"
+    go-bindata \
         -pkg docker \
         -nocompress \
         -nomemcopy \
@@ -59,7 +62,7 @@
         prebuilt-x86_64.tar.xz \
         prebuilt-arm.tar.xz
 
-    GOPATH="${srcdir}" go build
+    make build_simple
 }
 
 package() {
@@ -69,6 +72,6 @@
     install -Dm644 "${srcdir}/gitlab-runner.service" "${pkgdir}/usr/lib/systemd/system/gitlab-runner.service"
     install -Dm644 "${srcdir}/gitlab-runner.sysusers" "${pkgdir}/usr/lib/sysusers.d/gitlab-runner.conf"
     install -Dm644 "${srcdir}/gitlab-runner.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/gitlab-runner.conf"
-    install -Dm755 "gitlab-ci-multi-runner" "${pkgdir}/usr/bin/gitlab-ci-multi-runner"
+    install -Dm755 out/binaries/gitlab-ci-multi-runner "${pkgdir}/usr/bin/gitlab-ci-multi-runner"
     ln -s /usr/bin/gitlab-ci-multi-runner "${pkgdir}/usr/bin/gitlab-runner"
 }