Date: Tuesday, May 17, 2016 @ 22:53:52 Author: svenstaro Revision: 175595
archrelease: copy trunk to community-i686, community-x86_64 Added: gitlab-ci-multi-runner/repos/community-i686/PKGBUILD (from rev 175594, gitlab-ci-multi-runner/trunk/PKGBUILD) gitlab-ci-multi-runner/repos/community-i686/config.toml (from rev 175594, gitlab-ci-multi-runner/trunk/config.toml) gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.install (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.install) gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.service (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.service) gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.sysusers (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.sysusers) gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.tmpfiles (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.tmpfiles) gitlab-ci-multi-runner/repos/community-i686/godeps.patch (from rev 175594, gitlab-ci-multi-runner/trunk/godeps.patch) gitlab-ci-multi-runner/repos/community-x86_64/PKGBUILD (from rev 175594, gitlab-ci-multi-runner/trunk/PKGBUILD) gitlab-ci-multi-runner/repos/community-x86_64/config.toml (from rev 175594, gitlab-ci-multi-runner/trunk/config.toml) gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.install (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.install) gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.service (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.service) gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.sysusers (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.sysusers) gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.tmpfiles (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.tmpfiles) gitlab-ci-multi-runner/repos/community-x86_64/godeps.patch (from rev 175594, gitlab-ci-multi-runner/trunk/godeps.patch) Deleted: gitlab-ci-multi-runner/repos/community-i686/PKGBUILD gitlab-ci-multi-runner/repos/community-i686/config.toml gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.install gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.service gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.sysusers gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.tmpfiles gitlab-ci-multi-runner/repos/community-i686/godeps.patch gitlab-ci-multi-runner/repos/community-x86_64/PKGBUILD gitlab-ci-multi-runner/repos/community-x86_64/config.toml gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.install gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.service gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.sysusers gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.tmpfiles gitlab-ci-multi-runner/repos/community-x86_64/godeps.patch -----------------------------------------+ /PKGBUILD | 150 ++++++++++++++++++++++++++++++ /config.toml | 2 /gitlab-runner.install | 16 +++ /gitlab-runner.service | 34 ++++++ /gitlab-runner.sysusers | 2 /gitlab-runner.tmpfiles | 2 /godeps.patch | 26 +++++ community-i686/PKGBUILD | 75 --------------- community-i686/config.toml | 1 community-i686/gitlab-runner.install | 8 - community-i686/gitlab-runner.service | 17 --- community-i686/gitlab-runner.sysusers | 1 community-i686/gitlab-runner.tmpfiles | 1 community-i686/godeps.patch | 13 -- community-x86_64/PKGBUILD | 75 --------------- community-x86_64/config.toml | 1 community-x86_64/gitlab-runner.install | 8 - community-x86_64/gitlab-runner.service | 17 --- community-x86_64/gitlab-runner.sysusers | 1 community-x86_64/gitlab-runner.tmpfiles | 1 community-x86_64/godeps.patch | 13 -- 21 files changed, 232 insertions(+), 232 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-05-17 20:53:39 UTC (rev 175594) +++ community-i686/PKGBUILD 2016-05-17 20:53:52 UTC (rev 175595) @@ -1,75 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Lubomir 'Kuci' Kucera <kuci24-at-gmail-dot-com> - -pkgname=gitlab-ci-multi-runner -pkgver=1.1.3 -pkgrel=1 -pkgdesc="The official GitLab CI runner written in Go" -arch=('i686' 'x86_64') -url='https://gitlab.com/gitlab-org/gitlab-ci-multi-runner' -license=('GPLv3') -depends=('ca-certificates' 'curl' 'git' 'glibc' 'tar') -makedepends=('git' 'go' 'godep' 'go-bindata' 'mercurial') -install='gitlab-runner.install' -backup=('etc/gitlab-runner/config.toml') -noextract=('prebuilt.tar.gz') -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.tar.gz" - "gitlab-runner.install" - "gitlab-runner.service" - "gitlab-runner.sysusers" - "gitlab-runner.tmpfiles" - "config.toml" - "godeps.patch") -sha256sums=('fc05b5c0dab6251383319b6b4b7df9760c18f92073da34b49f6427d6f85f3478' - 'ad7aa6ba0f4f2be88772a82b1e52c6daf4da0b613c8b29c18b23a5abe117f7b3' - '289f73a16df5c8823a15b67a4aaa635d32b9c49ce4e11baa5d33f12828a1e0bb' - '843cabc4e1cfbf0a81365abae0c3d6ac388c00074017f9c286a7d5545828d1fa' - '0d7621aec132ce44d7dadbe6c5f43b330af5c1dddfe06c958336a297e70c5bba' - '8b17ed458da6926ea0d28aa4cb307b42b047bda9dfa4a96ee48e1c02051efb13' - 'b1f7d9a6a0148884528584909729cce817253759650da61d641e2225845f9330' - 'ec91955d60f3127237651050dc6cc64e5dfb8efb9485d514b301c558b16a1834') - -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}" - - cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}" - - # Patch invalid revisions in Godeps/Godeps.json - patch -p0 -i "${srcdir}/godeps.patch" - - GOPATH="${srcdir}" godep restore - - ln -sf "${srcdir}/prebuilt.tar.gz" prebuilt.tar.gz -} - -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 \ - -pkg docker \ - -nocompress \ - -nomemcopy \ - -prefix out/docker/ \ - -o executors/docker/bindata.go \ - prebuilt.tar.gz - - GOPATH="${srcdir}" go build \ - -ldflags "-X main.NAME=${pkgname} -X main.VERSION=${pkgver} -X main.REVISION=${_rev}" -} - -package() { - cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}" - - install -Dm644 "${srcdir}/config.toml" "${pkgdir}/etc/gitlab-runner/config.toml" - 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 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}" -} Copied: gitlab-ci-multi-runner/repos/community-i686/PKGBUILD (from rev 175594, gitlab-ci-multi-runner/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1,75 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Lubomir 'Kuci' Kucera <kuci24-at-gmail-dot-com> + +pkgname=gitlab-ci-multi-runner +pkgver=1.1.4 +pkgrel=1 +pkgdesc="The official GitLab CI runner written in Go" +arch=('i686' 'x86_64') +url='https://gitlab.com/gitlab-org/gitlab-ci-multi-runner' +license=('GPLv3') +depends=('ca-certificates' 'curl' 'git' 'glibc' 'tar') +makedepends=('git' 'go' 'godep' 'go-bindata' 'mercurial') +install='gitlab-runner.install' +backup=('etc/gitlab-runner/config.toml') +noextract=('prebuilt.tar.gz') +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.tar.gz" + "gitlab-runner.install" + "gitlab-runner.service" + "gitlab-runner.sysusers" + "gitlab-runner.tmpfiles" + "config.toml" + "godeps.patch") +sha256sums=('cd64a44b20e1e10ab80d538df8115a7b20b06fdc607f890a3aa467017925243c' + '2975278bad9885bdb5065160bc19e0dab8faff6d984935b69039c2d1dc947948' + '289f73a16df5c8823a15b67a4aaa635d32b9c49ce4e11baa5d33f12828a1e0bb' + '843cabc4e1cfbf0a81365abae0c3d6ac388c00074017f9c286a7d5545828d1fa' + '0d7621aec132ce44d7dadbe6c5f43b330af5c1dddfe06c958336a297e70c5bba' + '8b17ed458da6926ea0d28aa4cb307b42b047bda9dfa4a96ee48e1c02051efb13' + 'b1f7d9a6a0148884528584909729cce817253759650da61d641e2225845f9330' + 'ec91955d60f3127237651050dc6cc64e5dfb8efb9485d514b301c558b16a1834') + +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}" + + cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}" + + # Patch invalid revisions in Godeps/Godeps.json + patch -p0 -i "${srcdir}/godeps.patch" + + GOPATH="${srcdir}" godep restore + + ln -sf "${srcdir}/prebuilt.tar.gz" prebuilt.tar.gz +} + +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 \ + -pkg docker \ + -nocompress \ + -nomemcopy \ + -prefix out/docker/ \ + -o executors/docker/bindata.go \ + prebuilt.tar.gz + + GOPATH="${srcdir}" go build \ + -ldflags "-X main.NAME=${pkgname} -X main.VERSION=${pkgver} -X main.REVISION=${_rev}" +} + +package() { + cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}" + + install -Dm644 "${srcdir}/config.toml" "${pkgdir}/etc/gitlab-runner/config.toml" + 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 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}" +} Deleted: community-i686/config.toml =================================================================== --- community-i686/config.toml 2016-05-17 20:53:39 UTC (rev 175594) +++ community-i686/config.toml 2016-05-17 20:53:52 UTC (rev 175595) @@ -1 +0,0 @@ -concurrent = 4 Copied: gitlab-ci-multi-runner/repos/community-i686/config.toml (from rev 175594, gitlab-ci-multi-runner/trunk/config.toml) =================================================================== --- community-i686/config.toml (rev 0) +++ community-i686/config.toml 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1 @@ +concurrent = 4 Deleted: community-i686/gitlab-runner.install =================================================================== --- community-i686/gitlab-runner.install 2016-05-17 20:53:39 UTC (rev 175594) +++ community-i686/gitlab-runner.install 2016-05-17 20:53:52 UTC (rev 175595) @@ -1,8 +0,0 @@ -post_install() { - systemd-sysusers gitlab-runner.conf - systemd-tmpfiles --create gitlab-runner.conf - echo "Register the runner as root using" - echo "# gitlab-ci-multi-runner register" - echo "Configure the runner in /etc/gitlab-runner/config.toml" - echo "Use gitlab-runner.service to control the runner" -} Copied: gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.install (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.install) =================================================================== --- community-i686/gitlab-runner.install (rev 0) +++ community-i686/gitlab-runner.install 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1,8 @@ +post_install() { + systemd-sysusers gitlab-runner.conf + systemd-tmpfiles --create gitlab-runner.conf + echo "Register the runner as root using" + echo "# gitlab-ci-multi-runner register" + echo "Configure the runner in /etc/gitlab-runner/config.toml" + echo "Use gitlab-runner.service to control the runner" +} Deleted: community-i686/gitlab-runner.service =================================================================== --- community-i686/gitlab-runner.service 2016-05-17 20:53:39 UTC (rev 175594) +++ community-i686/gitlab-runner.service 2016-05-17 20:53:52 UTC (rev 175595) @@ -1,17 +0,0 @@ -[Unit] -Description=GitLab Runner -After=syslog.target network.target -ConditionFileIsExecutable=/usr/bin/gitlab-ci-multi-runner - -[Service] -StartLimitInterval=5 -StartLimitBurst=10 -ExecStart=/usr/bin/gitlab-ci-multi-runner "run" "--working-directory" "/var/lib/gitlab-runner" "--config" "/etc/gitlab-runner/config.toml" "--service" "gitlab-runner" "--user" "gitlab-runner" -Restart=always -RestartSec=120 -StandardOutput=syslog -StandardError=syslog -SyslogIdentifier=gitlab-runner - -[Install] -WantedBy=multi-user.target Copied: gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.service (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.service) =================================================================== --- community-i686/gitlab-runner.service (rev 0) +++ community-i686/gitlab-runner.service 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1,17 @@ +[Unit] +Description=GitLab Runner +After=syslog.target network.target +ConditionFileIsExecutable=/usr/bin/gitlab-ci-multi-runner + +[Service] +StartLimitInterval=5 +StartLimitBurst=10 +ExecStart=/usr/bin/gitlab-ci-multi-runner "run" "--working-directory" "/var/lib/gitlab-runner" "--config" "/etc/gitlab-runner/config.toml" "--service" "gitlab-runner" "--user" "gitlab-runner" +Restart=always +RestartSec=120 +StandardOutput=syslog +StandardError=syslog +SyslogIdentifier=gitlab-runner + +[Install] +WantedBy=multi-user.target Deleted: community-i686/gitlab-runner.sysusers =================================================================== --- community-i686/gitlab-runner.sysusers 2016-05-17 20:53:39 UTC (rev 175594) +++ community-i686/gitlab-runner.sysusers 2016-05-17 20:53:52 UTC (rev 175595) @@ -1 +0,0 @@ -u gitlab-runner 107 "GitLab Runner" /var/lib/gitlab-runner Copied: gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.sysusers (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.sysusers) =================================================================== --- community-i686/gitlab-runner.sysusers (rev 0) +++ community-i686/gitlab-runner.sysusers 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1 @@ +u gitlab-runner 107 "GitLab Runner" /var/lib/gitlab-runner Deleted: community-i686/gitlab-runner.tmpfiles =================================================================== --- community-i686/gitlab-runner.tmpfiles 2016-05-17 20:53:39 UTC (rev 175594) +++ community-i686/gitlab-runner.tmpfiles 2016-05-17 20:53:52 UTC (rev 175595) @@ -1 +0,0 @@ -d /var/lib/gitlab-runner 0700 gitlab-runner gitlab-runner - Copied: gitlab-ci-multi-runner/repos/community-i686/gitlab-runner.tmpfiles (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.tmpfiles) =================================================================== --- community-i686/gitlab-runner.tmpfiles (rev 0) +++ community-i686/gitlab-runner.tmpfiles 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1 @@ +d /var/lib/gitlab-runner 0700 gitlab-runner gitlab-runner - Deleted: community-i686/godeps.patch =================================================================== --- community-i686/godeps.patch 2016-05-17 20:53:39 UTC (rev 175594) +++ community-i686/godeps.patch 2016-05-17 20:53:52 UTC (rev 175595) @@ -1,13 +0,0 @@ ---- 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" - }, - { - "ImportPath": "github.com/Sirupsen/logrus", Copied: gitlab-ci-multi-runner/repos/community-i686/godeps.patch (from rev 175594, gitlab-ci-multi-runner/trunk/godeps.patch) =================================================================== --- community-i686/godeps.patch (rev 0) +++ community-i686/godeps.patch 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1,13 @@ +--- 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" + }, + { + "ImportPath": "github.com/Sirupsen/logrus", Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-05-17 20:53:39 UTC (rev 175594) +++ community-x86_64/PKGBUILD 2016-05-17 20:53:52 UTC (rev 175595) @@ -1,75 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Lubomir 'Kuci' Kucera <kuci24-at-gmail-dot-com> - -pkgname=gitlab-ci-multi-runner -pkgver=1.1.3 -pkgrel=1 -pkgdesc="The official GitLab CI runner written in Go" -arch=('i686' 'x86_64') -url='https://gitlab.com/gitlab-org/gitlab-ci-multi-runner' -license=('GPLv3') -depends=('ca-certificates' 'curl' 'git' 'glibc' 'tar') -makedepends=('git' 'go' 'godep' 'go-bindata' 'mercurial') -install='gitlab-runner.install' -backup=('etc/gitlab-runner/config.toml') -noextract=('prebuilt.tar.gz') -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.tar.gz" - "gitlab-runner.install" - "gitlab-runner.service" - "gitlab-runner.sysusers" - "gitlab-runner.tmpfiles" - "config.toml" - "godeps.patch") -sha256sums=('fc05b5c0dab6251383319b6b4b7df9760c18f92073da34b49f6427d6f85f3478' - 'ad7aa6ba0f4f2be88772a82b1e52c6daf4da0b613c8b29c18b23a5abe117f7b3' - '289f73a16df5c8823a15b67a4aaa635d32b9c49ce4e11baa5d33f12828a1e0bb' - '843cabc4e1cfbf0a81365abae0c3d6ac388c00074017f9c286a7d5545828d1fa' - '0d7621aec132ce44d7dadbe6c5f43b330af5c1dddfe06c958336a297e70c5bba' - '8b17ed458da6926ea0d28aa4cb307b42b047bda9dfa4a96ee48e1c02051efb13' - 'b1f7d9a6a0148884528584909729cce817253759650da61d641e2225845f9330' - 'ec91955d60f3127237651050dc6cc64e5dfb8efb9485d514b301c558b16a1834') - -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}" - - cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}" - - # Patch invalid revisions in Godeps/Godeps.json - patch -p0 -i "${srcdir}/godeps.patch" - - GOPATH="${srcdir}" godep restore - - ln -sf "${srcdir}/prebuilt.tar.gz" prebuilt.tar.gz -} - -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 \ - -pkg docker \ - -nocompress \ - -nomemcopy \ - -prefix out/docker/ \ - -o executors/docker/bindata.go \ - prebuilt.tar.gz - - GOPATH="${srcdir}" go build \ - -ldflags "-X main.NAME=${pkgname} -X main.VERSION=${pkgver} -X main.REVISION=${_rev}" -} - -package() { - cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}" - - install -Dm644 "${srcdir}/config.toml" "${pkgdir}/etc/gitlab-runner/config.toml" - 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 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}" -} Copied: gitlab-ci-multi-runner/repos/community-x86_64/PKGBUILD (from rev 175594, gitlab-ci-multi-runner/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1,75 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Lubomir 'Kuci' Kucera <kuci24-at-gmail-dot-com> + +pkgname=gitlab-ci-multi-runner +pkgver=1.1.4 +pkgrel=1 +pkgdesc="The official GitLab CI runner written in Go" +arch=('i686' 'x86_64') +url='https://gitlab.com/gitlab-org/gitlab-ci-multi-runner' +license=('GPLv3') +depends=('ca-certificates' 'curl' 'git' 'glibc' 'tar') +makedepends=('git' 'go' 'godep' 'go-bindata' 'mercurial') +install='gitlab-runner.install' +backup=('etc/gitlab-runner/config.toml') +noextract=('prebuilt.tar.gz') +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.tar.gz" + "gitlab-runner.install" + "gitlab-runner.service" + "gitlab-runner.sysusers" + "gitlab-runner.tmpfiles" + "config.toml" + "godeps.patch") +sha256sums=('cd64a44b20e1e10ab80d538df8115a7b20b06fdc607f890a3aa467017925243c' + '2975278bad9885bdb5065160bc19e0dab8faff6d984935b69039c2d1dc947948' + '289f73a16df5c8823a15b67a4aaa635d32b9c49ce4e11baa5d33f12828a1e0bb' + '843cabc4e1cfbf0a81365abae0c3d6ac388c00074017f9c286a7d5545828d1fa' + '0d7621aec132ce44d7dadbe6c5f43b330af5c1dddfe06c958336a297e70c5bba' + '8b17ed458da6926ea0d28aa4cb307b42b047bda9dfa4a96ee48e1c02051efb13' + 'b1f7d9a6a0148884528584909729cce817253759650da61d641e2225845f9330' + 'ec91955d60f3127237651050dc6cc64e5dfb8efb9485d514b301c558b16a1834') + +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}" + + cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}" + + # Patch invalid revisions in Godeps/Godeps.json + patch -p0 -i "${srcdir}/godeps.patch" + + GOPATH="${srcdir}" godep restore + + ln -sf "${srcdir}/prebuilt.tar.gz" prebuilt.tar.gz +} + +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 \ + -pkg docker \ + -nocompress \ + -nomemcopy \ + -prefix out/docker/ \ + -o executors/docker/bindata.go \ + prebuilt.tar.gz + + GOPATH="${srcdir}" go build \ + -ldflags "-X main.NAME=${pkgname} -X main.VERSION=${pkgver} -X main.REVISION=${_rev}" +} + +package() { + cd "${srcdir}/src/gitlab.com/gitlab-org/${pkgname}" + + install -Dm644 "${srcdir}/config.toml" "${pkgdir}/etc/gitlab-runner/config.toml" + 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 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}" +} Deleted: community-x86_64/config.toml =================================================================== --- community-x86_64/config.toml 2016-05-17 20:53:39 UTC (rev 175594) +++ community-x86_64/config.toml 2016-05-17 20:53:52 UTC (rev 175595) @@ -1 +0,0 @@ -concurrent = 4 Copied: gitlab-ci-multi-runner/repos/community-x86_64/config.toml (from rev 175594, gitlab-ci-multi-runner/trunk/config.toml) =================================================================== --- community-x86_64/config.toml (rev 0) +++ community-x86_64/config.toml 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1 @@ +concurrent = 4 Deleted: community-x86_64/gitlab-runner.install =================================================================== --- community-x86_64/gitlab-runner.install 2016-05-17 20:53:39 UTC (rev 175594) +++ community-x86_64/gitlab-runner.install 2016-05-17 20:53:52 UTC (rev 175595) @@ -1,8 +0,0 @@ -post_install() { - systemd-sysusers gitlab-runner.conf - systemd-tmpfiles --create gitlab-runner.conf - echo "Register the runner as root using" - echo "# gitlab-ci-multi-runner register" - echo "Configure the runner in /etc/gitlab-runner/config.toml" - echo "Use gitlab-runner.service to control the runner" -} Copied: gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.install (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.install) =================================================================== --- community-x86_64/gitlab-runner.install (rev 0) +++ community-x86_64/gitlab-runner.install 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1,8 @@ +post_install() { + systemd-sysusers gitlab-runner.conf + systemd-tmpfiles --create gitlab-runner.conf + echo "Register the runner as root using" + echo "# gitlab-ci-multi-runner register" + echo "Configure the runner in /etc/gitlab-runner/config.toml" + echo "Use gitlab-runner.service to control the runner" +} Deleted: community-x86_64/gitlab-runner.service =================================================================== --- community-x86_64/gitlab-runner.service 2016-05-17 20:53:39 UTC (rev 175594) +++ community-x86_64/gitlab-runner.service 2016-05-17 20:53:52 UTC (rev 175595) @@ -1,17 +0,0 @@ -[Unit] -Description=GitLab Runner -After=syslog.target network.target -ConditionFileIsExecutable=/usr/bin/gitlab-ci-multi-runner - -[Service] -StartLimitInterval=5 -StartLimitBurst=10 -ExecStart=/usr/bin/gitlab-ci-multi-runner "run" "--working-directory" "/var/lib/gitlab-runner" "--config" "/etc/gitlab-runner/config.toml" "--service" "gitlab-runner" "--user" "gitlab-runner" -Restart=always -RestartSec=120 -StandardOutput=syslog -StandardError=syslog -SyslogIdentifier=gitlab-runner - -[Install] -WantedBy=multi-user.target Copied: gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.service (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.service) =================================================================== --- community-x86_64/gitlab-runner.service (rev 0) +++ community-x86_64/gitlab-runner.service 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1,17 @@ +[Unit] +Description=GitLab Runner +After=syslog.target network.target +ConditionFileIsExecutable=/usr/bin/gitlab-ci-multi-runner + +[Service] +StartLimitInterval=5 +StartLimitBurst=10 +ExecStart=/usr/bin/gitlab-ci-multi-runner "run" "--working-directory" "/var/lib/gitlab-runner" "--config" "/etc/gitlab-runner/config.toml" "--service" "gitlab-runner" "--user" "gitlab-runner" +Restart=always +RestartSec=120 +StandardOutput=syslog +StandardError=syslog +SyslogIdentifier=gitlab-runner + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/gitlab-runner.sysusers =================================================================== --- community-x86_64/gitlab-runner.sysusers 2016-05-17 20:53:39 UTC (rev 175594) +++ community-x86_64/gitlab-runner.sysusers 2016-05-17 20:53:52 UTC (rev 175595) @@ -1 +0,0 @@ -u gitlab-runner 107 "GitLab Runner" /var/lib/gitlab-runner Copied: gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.sysusers (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.sysusers) =================================================================== --- community-x86_64/gitlab-runner.sysusers (rev 0) +++ community-x86_64/gitlab-runner.sysusers 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1 @@ +u gitlab-runner 107 "GitLab Runner" /var/lib/gitlab-runner Deleted: community-x86_64/gitlab-runner.tmpfiles =================================================================== --- community-x86_64/gitlab-runner.tmpfiles 2016-05-17 20:53:39 UTC (rev 175594) +++ community-x86_64/gitlab-runner.tmpfiles 2016-05-17 20:53:52 UTC (rev 175595) @@ -1 +0,0 @@ -d /var/lib/gitlab-runner 0700 gitlab-runner gitlab-runner - Copied: gitlab-ci-multi-runner/repos/community-x86_64/gitlab-runner.tmpfiles (from rev 175594, gitlab-ci-multi-runner/trunk/gitlab-runner.tmpfiles) =================================================================== --- community-x86_64/gitlab-runner.tmpfiles (rev 0) +++ community-x86_64/gitlab-runner.tmpfiles 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1 @@ +d /var/lib/gitlab-runner 0700 gitlab-runner gitlab-runner - Deleted: community-x86_64/godeps.patch =================================================================== --- community-x86_64/godeps.patch 2016-05-17 20:53:39 UTC (rev 175594) +++ community-x86_64/godeps.patch 2016-05-17 20:53:52 UTC (rev 175595) @@ -1,13 +0,0 @@ ---- 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" - }, - { - "ImportPath": "github.com/Sirupsen/logrus", Copied: gitlab-ci-multi-runner/repos/community-x86_64/godeps.patch (from rev 175594, gitlab-ci-multi-runner/trunk/godeps.patch) =================================================================== --- community-x86_64/godeps.patch (rev 0) +++ community-x86_64/godeps.patch 2016-05-17 20:53:52 UTC (rev 175595) @@ -0,0 +1,13 @@ +--- 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" + }, + { + "ImportPath": "github.com/Sirupsen/logrus",