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

[Sven-Hendrik Haase]

    Date: Sunday, October 23, 2016 @ 17:26:48
  Author: svenstaro
Revision: 193104

upgpkg: gitlab-ci-multi-runner 1.7.0-2

build from git to fix version issue

Modified:
  gitlab-ci-multi-runner/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-23 17:06:02 UTC (rev 193103)
+++ PKGBUILD	2016-10-23 17:26:48 UTC (rev 193104)
@@ -3,18 +3,21 @@
 
 pkgname=gitlab-ci-multi-runner
 pkgver=1.7.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'
 license=('GPL3')
 depends=('ca-certificates' 'curl' 'git' 'glibc' 'tar')
-makedepends=('git' 'go' 'godep' 'go-bindata' 'mercurial')
+makedepends=('git' 'go' 'git' 'go-bindata' 'mercurial')
 install='gitlab-runner.install'
 backup=('etc/gitlab-runner/config.toml')
 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}"
+
+# Note: This should be built using git because the runner gets its version information from there and I
+# haven't found the place to patch that yet.
+source=("git+https://gitlab.com/gitlab-org/gitlab-ci-multi-runner.git#tag=v${pkgver}"
         "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-x86_64.tar.xz"
         "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-arm.tar.xz"
         "gitlab-runner.install"
@@ -22,7 +25,7 @@
         "gitlab-runner.sysusers"
         "gitlab-runner.tmpfiles"
         "config.toml")
-sha256sums=('ffcc18bfc54d4e2846bbfb21e72798c90ca5af214ac606ea07fbbeec24bb155f'
+sha256sums=('SKIP'
             '2c0d97469a124956d7f71601848dadd0df644e2bd8e8555d0deb4e7f47c7be52'
             'fc5ad1eb24104e453ff4412fbf4bd304e0d04ffeb7ce3f4d0440e6328ddf474f'
             'd8b75e676727989115ab11d6a74281de61daed64a72dcc21d98814e845cdcf91'
@@ -32,12 +35,8 @@
             'b1f7d9a6a0148884528584909729cce817253759650da61d641e2225845f9330')
 
 prepare() {
-    _srcdir=$(ls "${srcdir}" | grep -E "${pkgname}-v${pkgver}-[0-9a-f]{40}")
-
     mkdir -p "${srcdir}/src/gitlab.com/gitlab-org/"
-
-    ln -sf "${srcdir}/${_srcdir}" "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}"
-
+    ln -sf "${srcdir}/gitlab-ci-multi-runner" "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}"
     cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}"
 
     export GOPATH="${srcdir}"
@@ -48,8 +47,6 @@
 }
 
 build() {
-    _rev=$(ls "${srcdir}" | grep -Po "${pkgname}-v${pkgver}-\K([0-9a-f]{7})")
-
     cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}"
 
     GOPATH="${srcdir}" go-bindata \
@@ -61,8 +58,7 @@
         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}"
+    GOPATH="${srcdir}" go build
 }
 
 package() {