diff options
author | Yann Büchau | 2020-11-21 16:25:53 +0100 |
---|---|---|
committer | Yann Büchau | 2020-11-21 16:25:53 +0100 |
commit | 582d25e30f4acbea1a593c36b80e9edc824654ac (patch) | |
tree | 67eb7d61945231e9be518a2df1ab522ab86f1511 | |
parent | 09dba4f125fd90612fc113c5f52bb188896183a6 (diff) | |
download | aur-582d25e30f4acbea1a593c36b80e9edc824654ac.tar.gz |
Adjust upstream Arch `gitlab-runner` PKGBUILD for aarch64
- https://github.com/archlinux/svntogit-community/tree/packages/gitlab-runner/trunk
-rw-r--r-- | .SRCINFO | 26 | ||||
-rw-r--r-- | PKGBUILD | 64 | ||||
-rw-r--r-- | config.toml | 2 |
3 files changed, 50 insertions, 42 deletions
@@ -1,38 +1,40 @@ pkgbase = gitlab-runner-arm64 - pkgdesc = The official GitLab CI runner written in Go (Requires a swap partition to build on Raspberry 3) - pkgver = 11.5.0 + pkgdesc = The official GitLab CI runner written in Go + pkgver = 13.5.0 pkgrel = 1 url = https://gitlab.com/gitlab-org/gitlab-runner install = gitlab-runner.install + arch = x86_64 arch = aarch64 license = GPL3 makedepends = git - makedepends = go-pie + makedepends = go makedepends = git makedepends = mercurial + makedepends = gox depends = ca-certificates depends = curl depends = git depends = glibc depends = tar replaces = gitlab-ci-multi-runner - noextract = prebuilt-11.5.0-x86_64.tar.xz - noextract = prebuilt-11.5.0-arm.tar.xz + noextract = prebuilt-13.5.0-x86_64.tar.xz + noextract = prebuilt-13.5.0-arm.tar.xz backup = etc/gitlab-runner/config.toml - source = gitlab-runner-arm64-11.5.0.tar.gz::https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab-runner/repository/archive?sha=v11.5.0 - source = prebuilt-11.5.0-x86_64.tar.xz::https://gitlab-runner-downloads.s3.amazonaws.com/v11.5.0/helper-images/prebuilt-x86_64.tar.xz - source = prebuilt-11.5.0-arm.tar.xz::https://gitlab-runner-downloads.s3.amazonaws.com/v11.5.0/helper-images/prebuilt-arm.tar.xz + source = gitlab-runner-arm64-13.5.0.tar.gz::https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab-runner/repository/archive?sha=v13.5.0 + source = prebuilt-13.5.0-x86_64.tar.xz::https://gitlab-runner-downloads.s3.amazonaws.com/v13.5.0/helper-images/prebuilt-x86_64.tar.xz + source = prebuilt-13.5.0-arm.tar.xz::https://gitlab-runner-downloads.s3.amazonaws.com/v13.5.0/helper-images/prebuilt-arm.tar.xz source = gitlab-runner.service source = gitlab-runner.sysusers source = gitlab-runner.tmpfiles source = config.toml - sha512sums = 7e03ca44b69693990e4ebfd52ca75a2db1abe6e360a60a1e009ef708d484f9de17a2db2e3cf52abd316519b4b2cdab5b7a670ebf5182aee73d38efdddc0c3863 - sha512sums = e23821b7334997c41025ff34f3f2375f09d74651888e388f7d4d4f862f17a2e09dd16462ce67bbe0afe36af1e1e219811707195fff283cde966b2149de15e1ed - sha512sums = 12fd6a876deadc292902cec7e8d760c466cea7a7df14264b69ce992ff63d96e513f458473c1158cff104532810bdcb80f963cc2f7316c3503a525935b54c231a + sha512sums = 57564e2e89c64ec5936d331a1a7fb5ab6e7978b695e4b7423f45bb1bc1a41222ebc663389a25e5061320fa5cb2619ec631a45da749a407fe095e981505677520 + sha512sums = 94181b9238bdde74c88e05c37f93d6ce242bb5d8abc45158f7f4bf9bec2e09c9beafa8636f4589f9e917ed7f0aafc0858b3d3ffc13936da70981028703ca4016 + sha512sums = b62856843fe5d221afbb91e9b0b81071975a2062f36340f9d79af744b759c864f9a37e1b5c796efe8394ce2319b4fac8181a8835a87a8d8c741ae9b35bb6929a sha512sums = 8a5a8b7654d3864722e784b2814c6278c17876f1c0c4fc0676fbcf6817ad2ba4be55501e67ce88c62b5b63ca886b01afc6feac98ba49842acd244abdd1a8296f sha512sums = 8aa7f08702e99053c696fcc2aaba83beb9e9cd6f31973d82862db9350ac46df3a095377625d31fe909677525290d2de922d7a97930ed235774cb8f0da8944d40 sha512sums = 6751d9fa0b27172d1b419c4138f5ac15cbc7c9147653a7258cf1470216142c637210bb60608c7ed0974e0e4057e5ddeae32225df1bb36e7dd1f20fec71e33cc3 - sha512sums = f39c23fc06636f31c3fadb9a630c54527e8255098f18d275772cb30875d0a7463717101704070d432f2b69ab71f076a9538172a439bc307722dad2c7e260f752 + sha512sums = 9718b94bd0ddb09095ffb8c1e60ca1e9649dabb1747e7fc95e58e404b2f9effdeb4cfd759f5b904443dc53a4e18c02003c38f85584713deb49f6a6d1007503de pkgname = gitlab-runner-arm64 @@ -1,22 +1,22 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Maintainer: nobodyinperson <nobodyinperson-at-posteo-de> +# Contributor: Sven-Hendrik Haase <svenstaro@gmail.com> # Contributor: Lubomir 'Kuci' Kucera <kuci24-at-gmail-dot-com> # Contributor: Franck Lucien Duriez <franck.lucien.duriez@gmail.com> pkgname=gitlab-runner-arm64 -pkgver=11.5.0 +pkgver=13.5.0 pkgrel=1 -pkgdesc="The official GitLab CI runner written in Go (Requires a swap partition to build on Raspberry 3)" -arch=('aarch64') +pkgdesc="The official GitLab CI runner written in Go" +arch=('x86_64' 'aarch64') url='https://gitlab.com/gitlab-org/gitlab-runner' license=('GPL3') depends=('ca-certificates' 'curl' 'git' 'glibc' 'tar') -makedepends=('git' 'go-pie' 'git' 'mercurial') -install='gitlab-runner.install' +makedepends=('git' 'go' 'git' 'mercurial' 'gox') +install=gitlab-runner.install replaces=('gitlab-ci-multi-runner') backup=('etc/gitlab-runner/config.toml') noextract=("prebuilt-${pkgver}-x86_64.tar.xz" "prebuilt-${pkgver}-arm.tar.xz") - source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab-runner/repository/archive?sha=v${pkgver}" "prebuilt-${pkgver}-x86_64.tar.xz::https://gitlab-runner-downloads.s3.amazonaws.com/v${pkgver}/helper-images/prebuilt-x86_64.tar.xz" "prebuilt-${pkgver}-arm.tar.xz::https://gitlab-runner-downloads.s3.amazonaws.com/v${pkgver}/helper-images/prebuilt-arm.tar.xz" @@ -24,45 +24,51 @@ source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/api/v4/projects/gitlab-org% "gitlab-runner.sysusers" "gitlab-runner.tmpfiles" "config.toml") -sha512sums=('7e03ca44b69693990e4ebfd52ca75a2db1abe6e360a60a1e009ef708d484f9de17a2db2e3cf52abd316519b4b2cdab5b7a670ebf5182aee73d38efdddc0c3863' - 'e23821b7334997c41025ff34f3f2375f09d74651888e388f7d4d4f862f17a2e09dd16462ce67bbe0afe36af1e1e219811707195fff283cde966b2149de15e1ed' - '12fd6a876deadc292902cec7e8d760c466cea7a7df14264b69ce992ff63d96e513f458473c1158cff104532810bdcb80f963cc2f7316c3503a525935b54c231a' +sha512sums=('57564e2e89c64ec5936d331a1a7fb5ab6e7978b695e4b7423f45bb1bc1a41222ebc663389a25e5061320fa5cb2619ec631a45da749a407fe095e981505677520' + '94181b9238bdde74c88e05c37f93d6ce242bb5d8abc45158f7f4bf9bec2e09c9beafa8636f4589f9e917ed7f0aafc0858b3d3ffc13936da70981028703ca4016' + 'b62856843fe5d221afbb91e9b0b81071975a2062f36340f9d79af744b759c864f9a37e1b5c796efe8394ce2319b4fac8181a8835a87a8d8c741ae9b35bb6929a' '8a5a8b7654d3864722e784b2814c6278c17876f1c0c4fc0676fbcf6817ad2ba4be55501e67ce88c62b5b63ca886b01afc6feac98ba49842acd244abdd1a8296f' '8aa7f08702e99053c696fcc2aaba83beb9e9cd6f31973d82862db9350ac46df3a095377625d31fe909677525290d2de922d7a97930ed235774cb8f0da8944d40' '6751d9fa0b27172d1b419c4138f5ac15cbc7c9147653a7258cf1470216142c637210bb60608c7ed0974e0e4057e5ddeae32225df1bb36e7dd1f20fec71e33cc3' - 'f39c23fc06636f31c3fadb9a630c54527e8255098f18d275772cb30875d0a7463717101704070d432f2b69ab71f076a9538172a439bc307722dad2c7e260f752') + '9718b94bd0ddb09095ffb8c1e60ca1e9649dabb1747e7fc95e58e404b2f9effdeb4cfd759f5b904443dc53a4e18c02003c38f85584713deb49f6a6d1007503de') _srcdir="gitlab-runner-v${pkgver}-" prepare() { - local revision=$(ls -d ${_srcdir}* | rev | cut -c 33-40 | rev) + local revision=$(ls -d ${_srcdir}* | rev | cut -c 33-40 | rev) - mkdir -p "${srcdir}/src/gitlab.com/gitlab-org/" - ln -sf "${srcdir}/${_srcdir}"* "${srcdir}/src/gitlab.com/gitlab-org/gitlab-runner" - cd "${srcdir}/src/gitlab.com/gitlab-org/gitlab-runner" + cd "${_srcdir}"* - local version=$(cat VERSION) + local version=$(cat VERSION) - sed -i "s/export VERSION.*/export VERSION = $version/" Makefile - sed -i "s/REVISION := .*/REVISION := $revision/" Makefile + sed -i "s/export VERSION.*/export VERSION := $version/" Makefile + sed -i "s/REVISION := .*/REVISION := $revision/" Makefile + sed -i "s/var VERSION.*/var VERSION = \"$version\"/" common/version.go - make version + make version - ln -sf "${srcdir}/prebuilt-${pkgver}-x86_64.tar.xz" prebuilt-x86_64.tar.xz - ln -sf "${srcdir}/prebuilt-${pkgver}-arm.tar.xz" prebuilt-arm.tar.xz + ln -sf "${srcdir}/prebuilt-${pkgver}-x86_64.tar.xz" prebuilt-x86_64.tar.xz + ln -sf "${srcdir}/prebuilt-${pkgver}-arm.tar.xz" prebuilt-arm.tar.xz } build() { - cd "${srcdir}/src/gitlab.com/gitlab-org/gitlab-runner" - make BUILD_PLATFORMS='-osarch linux/arm64' build + export CGO_LDFLAGS="${LDFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw" + + cd "${_srcdir}"* + go build -o gitlab-runner . } package() { - cd "${srcdir}/src/gitlab.com/gitlab-org/gitlab-runner" + cd "${_srcdir}"* - 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 out/binaries/gitlab-runner-linux-arm64 "${pkgdir}/usr/bin/gitlab-runner" + 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 gitlab-runner "${pkgdir}/usr/bin/gitlab-runner" } + diff --git a/config.toml b/config.toml index 97e906ccde9d..9a42ad63db7b 100644 --- a/config.toml +++ b/config.toml @@ -1 +1 @@ -concurrent = 4 +concurrent = 1 |