summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorShohei Maruyama2021-01-27 23:56:48 +0900
committerShohei Maruyama2021-01-28 00:14:06 +0900
commite03b0e279e10317c978cf30666c32d7b45c3d1e7 (patch)
tree0f48e087d7721a9ffbe4bb0499cfa334efe70692
parent010551a762b29ed7ee659f7a1cb95fa49fde7d7f (diff)
downloadaur-e03b0e279e10317c978cf30666c32d7b45c3d1e7.tar.gz
concourse: Update to 6.7.4
This commit updates the source version to 6.7.4. This changes introduces providing fly command in separated packages. Signed-off-by: Shohei Maruyama <cheat.sc.linux@outlook.com>
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD67
2 files changed, 65 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c9244094957..a97464d6536 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,24 @@
pkgbase = concourse
- pkgdesc = Concourse is a container-based continuous thing-doer written in Go and Elm
- pkgver = 5.5.11
+ pkgver = 6.7.4
pkgrel = 1
url = https://concourse-ci.org
arch = x86_64
license = Apache-2.0
makedepends = go-pie
- source = concourse-5.5.11.tar.gz::https://github.com/concourse/concourse/archive/v5.5.11.tar.gz
- sha256sums = a04f945719d7b51054d48f35558b3f14e466d8fbe39971987ed8701a35994ea2
+ makedepends = yarn
+ source = concourse-6.7.4.tar.gz::https://github.com/concourse/concourse/archive/v6.7.4.tar.gz
+ sha256sums = d8e95f7a38c7efab9450315b64250bb5c26baec9f49ae204a6dbce31c9a62244
pkgname = concourse
+ pkgdesc = Concourse is a container-based continuous thing-doer written in Go and Elm
+ optdepends = cni-plugins
+ optdepends = containerd
+ conflicts = concourse-bin
+
+pkgname = concourse-fly-cli
+ pkgdesc = A command line interface that runs a build in a container with ATC
+ conflicts = concourse-fly
+ conflicts = concourse-fly-bin
+ conflicts = concourse-fly-git
+ conflicts = fly-cli
diff --git a/PKGBUILD b/PKGBUILD
index 5e7ae9ec8e0..adf0343b6c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,68 @@
# Maintainer: Dimitris Kiziridis <ragouel at outlook dot com>
+# Maintainer: Shohei Maruyama <cheat.sc.linux@outlook.com>
# Contributor: Bram Swenson <bram@amplified.work>
-pkgname=concourse
-pkgver=5.5.11
+pkgbase='concourse'
+pkgname=('concourse' 'concourse-fly-cli')
+pkgver=6.7.4
pkgrel=1
-pkgdesc="Concourse is a container-based continuous thing-doer written in Go and Elm"
arch=('x86_64')
url='https://concourse-ci.org'
license=('Apache-2.0')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/concourse/concourse/archive/v${pkgver}.tar.gz")
-makedepends=('go-pie')
-sha256sums=('a04f945719d7b51054d48f35558b3f14e466d8fbe39971987ed8701a35994ea2')
+makedepends=('go-pie' 'yarn')
+sha256sums=('d8e95f7a38c7efab9450315b64250bb5c26baec9f49ae204a6dbce31c9a62244')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- mkdir -p $srcdir/go
- export GOPATH="${srcdir}"/go
- export PATH=$PATH:$GOPATH/bin
- go get -d -v ./...
+ mkdir -p "${srcdir}/go"
+ export GOPATH="${srcdir}/go"
+ export PATH=$PATH:"$GOPATH/bin"
+
+ # Change binary asset directory
+ sed -e 's#binariesDir = "/usr/local/concourse/bin"#binariesDir = "/usr/lib/cni"#' -i worker/runtime/cni_network.go
+ sed -e 's#/usr/local/concourse/bin/init#/usr/lib/concourse/bin/init#' -i worker/runtime/spec/mounts.go
+
+ go get github.com/gobuffalo/packr/packr
+
+ go get -d ./...
+ yarn
}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}/cmd/concourse"
- export GOPATH="${srcdir}"/go
- export PATH=$PATH:$GOPATH/bin
- go build -v -o "${srcdir}/${pkgname}-bin"
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ export GOPATH="${srcdir}/go"
+ export PATH=$PATH:"$GOPATH/bin"
+ ldflags="-X github.com/concourse/concourse.Version=${pkgver}"
+ yarn build
+ packr build -o concourse -trimpath -ldflags "${ldflags}" ./cmd/concourse
+ packr build -o fly -trimpath -ldflags "${ldflags}" ./fly
+ gcc -O2 -static cmd/init/init.c -o init
+}
+
+package_concourse() {
+ pkgname=concourse
+ pkgdesc="Concourse is a container-based continuous thing-doer written in Go and Elm"
+ optdepends=('cni-plugins' 'containerd')
+ conflicts=('concourse-bin')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/concourse"
+ install -Dm755 init "${pkgdir}/usr/lib/concourse/bin/init"
+
+ mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
+ ln -s /usr/share/licenses/common/Apache/license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
-package() {
- install -Dm755 "${pkgname}-bin" "${pkgdir}/usr/bin/concourse"
+package_concourse-fly-cli() {
+ pkgname=concourse-fly-cli
+ pkgdesc="A command line interface that runs a build in a container with ATC"
+ conflicts=('concourse-fly' 'concourse-fly-bin' 'concourse-fly-git' 'fly-cli')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ install -Dm755 "fly/fly" "${pkgdir}/usr/bin/fly"
+
mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
ln -s /usr/share/licenses/common/Apache/license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- go clean -modcache #Remove cached go libraries
-} \ No newline at end of file
+}