diff options
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | PKGBUILD | 26 | ||||
| -rw-r--r-- | jenkins.conf | 5 | ||||
| -rw-r--r-- | jenkins.install | 8 | ||||
| -rw-r--r-- | jenkins.service | 11 |
5 files changed, 34 insertions, 38 deletions
@@ -1,31 +1,33 @@ pkgbase = jenkins-lts pkgdesc = Extendable continuous integration server (lts) - pkgver = 2.150.3 - pkgrel = 1 + pkgver = 2.440.2 + pkgrel = 1 url = https://jenkins.io install = jenkins.install arch = any license = MIT - depends = java-runtime-headless=8 + makedepends = java-environment=17 + makedepends = git + makedepends = maven + depends = java-runtime-headless=17 depends = ttf-dejavu - depends = libcups + depends = fontconfig provides = jenkins-ci conflicts = jenkins-ci replaces = jenkins-ci - noextract = jenkins-2.150.3.war + noextract = jenkins-2.361.2.war backup = etc/conf.d/jenkins - source = jenkins-2.150.3.war::http://mirrors.jenkins.io/war-stable/2.150.3/jenkins.war + source = jenkins-2.440.2.war::https://get.jenkins.io/war-stable/2.440.2/jenkins.war source = jenkins.conf source = jenkins.service source = jenkins.tmpfiles source = jenkins.sysusers source = LICENSE - sha512sums = b2a5bf51b09b9df9bec13f09f911c76c1bb0c2edc91f0933caf6f71e4c296e5f53ad54711aa6632b5f3e3dcb1f335594517a0c086e23fad8892fb6a3e77dd978 - sha512sums = 3a8421cef3953d899c150609f959cf5d5dd6d08d079a5e0f48bfece4f3c80491722b9e90ef841fddb87401c226b8338297c5c4e83e55a33ef8d6e387de3048d0 - sha512sums = a336b006d3711abb75b49a2e12c09ee61cf3275a2cdbbd3676480e2f6ca8ba0fb4b9c08f3f9da193252c4fca827e9a1d5eaad847d0a889445693427ae1571fe7 + sha512sums = dc7bb525b222f0fd0216304c97b8a1e84fb6c1bafbea46e83261e9db0c8cf4378fd9b621822667eaaa627d970c5e7fd88cd1b6706f1dc478d2b0fc7b9629369f + sha512sums = 482b642988027b623995e0488cc00011be5bbe9890a6d40dd6979197fa50794889ff731f798891106b367962cf60cb59b0260caadfcee9685b358a966f759553 + sha512sums = c1e9a542bfd3db54ea0ef57acdac47ad5180330f9ffab44296762b0e69e75ce595d85a77d46025586fb507aedce4f1a032379dcd16b7b886fe475a99849fa4b2 sha512sums = a845a7147be54affc586dfce9a188ec24c92e673e88dec0b62da386d2e597de6ecda103429008562abd897f179a52c37cf2188ebc65b8c636efd07d707e18f90 sha512sums = 896cbc64eadb2f3bb9fa7fc26dbfc527b1823d8bff3158be7f1936cc250f55eeafe89079e1ceb8f3d269041662573ccbbb36248140b4ba24144a564366f8847a sha512sums = 0df6479a600db395c12ad29ebda3120d00460338b9a6b15913e2245aa29212a3798c32e664ca70c8034146e2e0b573066deec9e3210198202f753994e1b83efa pkgname = jenkins-lts - @@ -1,41 +1,47 @@ -# $Id$ # Maintainer: Benjamin Asbach <archlinux-aur.${pkgname}@impl.it> pkgname=jenkins-lts -pkgver=2.150.3 +pkgver=2.440.2 pkgrel=1 +_java=17 pkgdesc='Extendable continuous integration server (lts)' arch=('any') url='https://jenkins.io' license=('MIT') -depends=('java-runtime-headless=8' 'ttf-dejavu' 'libcups') +depends=("java-runtime=${_java}" 'ttf-dejavu' 'fontconfig') +makedepends=("java-environment=${_java}" 'git' 'maven') provides=('jenkins-ci') conflicts=('jenkins-ci') replaces=('jenkins-ci') backup=('etc/conf.d/jenkins') install='jenkins.install' noextract=("jenkins-${pkgver}.war") -source=("jenkins-${pkgver}.war::http://mirrors.jenkins.io/war-stable/${pkgver}/jenkins.war" +source=("jenkins-${pkgver}.war::https://get.jenkins.io/war-stable/$pkgver/jenkins.war" # Rename to force re-download on new version 'jenkins.conf' 'jenkins.service' 'jenkins.tmpfiles' 'jenkins.sysusers' 'LICENSE') -sha512sums=('b2a5bf51b09b9df9bec13f09f911c76c1bb0c2edc91f0933caf6f71e4c296e5f53ad54711aa6632b5f3e3dcb1f335594517a0c086e23fad8892fb6a3e77dd978' - '3a8421cef3953d899c150609f959cf5d5dd6d08d079a5e0f48bfece4f3c80491722b9e90ef841fddb87401c226b8338297c5c4e83e55a33ef8d6e387de3048d0' - 'a336b006d3711abb75b49a2e12c09ee61cf3275a2cdbbd3676480e2f6ca8ba0fb4b9c08f3f9da193252c4fca827e9a1d5eaad847d0a889445693427ae1571fe7' +sha512sums=('590bd2d781671f91401922ee09aee5d2973d6d6a67fedd46b0073dd24a1826822f5beb8f266094055566bcc848b5e88ebd589562e0ddd49f398037919cb92fc0' + '482b642988027b623995e0488cc00011be5bbe9890a6d40dd6979197fa50794889ff731f798891106b367962cf60cb59b0260caadfcee9685b358a966f759553' + 'c1e9a542bfd3db54ea0ef57acdac47ad5180330f9ffab44296762b0e69e75ce595d85a77d46025586fb507aedce4f1a032379dcd16b7b886fe475a99849fa4b2' 'a845a7147be54affc586dfce9a188ec24c92e673e88dec0b62da386d2e597de6ecda103429008562abd897f179a52c37cf2188ebc65b8c636efd07d707e18f90' '896cbc64eadb2f3bb9fa7fc26dbfc527b1823d8bff3158be7f1936cc250f55eeafe89079e1ceb8f3d269041662573ccbbb36248140b4ba24144a564366f8847a' '0df6479a600db395c12ad29ebda3120d00460338b9a6b15913e2245aa29212a3798c32e664ca70c8034146e2e0b573066deec9e3210198202f753994e1b83efa') +build() { + export PATH="/usr/lib/jvm/java-${_java}-openjdk/bin:${PATH}" +} +check() { + export PATH="/usr/lib/jvm/java-${_java}-openjdk/bin:${PATH}" +} package() { - install -Dm444 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm444 "jenkins-${pkgver}.war" "$pkgdir/usr/share/java/jenkins/jenkins.war" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 "jenkins-${pkgver}.war" "$pkgdir/usr/share/java/jenkins/jenkins.war" install -Dm644 jenkins.service "$pkgdir/usr/lib/systemd/system/jenkins.service" install -Dm644 jenkins.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/jenkins.conf" install -Dm644 jenkins.sysusers "$pkgdir/usr/lib/sysusers.d/jenkins.conf" install -Dm644 jenkins.conf "$pkgdir/etc/conf.d/jenkins" } -# vim:set ts=2 sw=2 et: diff --git a/jenkins.conf b/jenkins.conf index 5975142010e3..529d5368349a 100644 --- a/jenkins.conf +++ b/jenkins.conf @@ -1,4 +1,4 @@ -JAVA=/usr/bin/java +JAVA=/usr/lib/jvm/java-17-openjdk/bin/java JAVA_ARGS=-Xmx512m JAVA_OPTS= JENKINS_USER=jenkins @@ -6,8 +6,7 @@ JENKINS_HOME=/var/lib/jenkins JENKINS_WAR=/usr/share/java/jenkins/jenkins.war JENKINS_WEBROOT=--webroot=/var/cache/jenkins JENKINS_PORT=--httpPort=8090 -JENKINS_AJPPORT=--ajp13Port=-1 JENKINS_OPTS= -JENKINS_COMMAND_LINE="$JAVA $JAVA_ARGS $JAVA_OPTS -jar $JENKINS_WAR $JENKINS_WEBROOT $JENKINS_PORT $JENKINS_AJPPORT $JENKINS_OPTS" +JENKINS_COMMAND_LINE="$JAVA $JAVA_ARGS $JAVA_OPTS -jar $JENKINS_WAR $JENKINS_WEBROOT $JENKINS_PORT $JENKINS_OPTS" # vim:set ts=2 sw=2 et: diff --git a/jenkins.install b/jenkins.install index e86d9caa75c8..48c5bfa52130 100644 --- a/jenkins.install +++ b/jenkins.install @@ -1,9 +1,7 @@ post_install() { + # We need to know uid and gid to create /var/lib/jenkins with proper + # permissions. So keep systemd-sysusers invocation here despite having + # pacman hooks. systemd-sysusers jenkins.conf [[ -d var/lib/jenkins ]] || install -dm 750 -o jenkins -g jenkins var/lib/jenkins - systemd-tmpfiles --create jenkins.conf -} - -post_upgrade() { - (( $(vercmp $2 '1.633-1') < 0 )) && systemd-sysusers jenkins.conf || true } diff --git a/jenkins.service b/jenkins.service index 3b98338a78a6..5df6e76a3266 100644 --- a/jenkins.service +++ b/jenkins.service @@ -4,21 +4,12 @@ After=network.target [Service] User=jenkins -Type=simple +Type=exec EnvironmentFile=/etc/conf.d/jenkins StandardOutput=syslog StandardError=syslog SyslogIdentifier=jenkins ExecStart=/bin/sh -c 'eval $JENKINS_COMMAND_LINE' -#MemoryLimit=768M -OOMScoreAdjust=-1000 -LimitCPU=infinity -LimitFSIZE=infinity -LimitDATA=infinity -LimitCORE=0 -LimitAS=infinity -LimitLOCKS=infinity [Install] WantedBy=multi-user.target - |