Merge branch 'binary'

2 files changed, 13 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ffab464b0e83..031f21948e25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,20 @@
-# Maintainer: Polarian <polarian@polarian.dev>
-# Contributor: Charles Leclerc <charles@la-mouette.net>
+# Maintainer: Charles Leclerc <charles@la-mouette.net>
 
 pkgname=reposilite
-pkgver=3.4.10
+pkgver=3.5.6
 pkgrel=1
 pkgdesc="Lightweight repository manager for Maven artifacts. It is a simple solution to replace managers like Nexus, Archiva or Artifactory."
 arch=(any)
 url="https://reposilite.com"
 license=('Apache')
-depends=('java-runtime-headless>=19')
-makedepends=('java-environment=19' 'nodejs' 'npm' 'gradle')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/dzikoysk/reposilite/archive/$pkgver.tar.gz"
+depends=('java-runtime-headless>=11')
+source=("https://maven.reposilite.com/releases/com/reposilite/$pkgname/$pkgver/$pkgname-$pkgver-all.jar"
         "$pkgname.service"
         "$pkgname.sysusers"
         "$pkgname.tmpfiles"
         "$pkgname.env"
         "$pkgname.wrapper")
-sha256sums=('0a6c3a30d4e20ddd5a561188b1da9be04d556e133368f13f033a0664d822d64a'
+sha256sums=('caadb4fcdf6075ba9c9bebbc9ba2d4f8c38d1593b16da9b33c37b15036474dfd'
             '1e543e7ef39d64ae683156aaa6aad8f164f30de999d15717416410e1750b9a8e'
             '92ccfeff429aa4757ef353677dd99ad7aebe7483d4824706a27250e81efd6323'
             '9587fa49dd66d5f31dee33aa1a9da269a34666b63f62e2550a66c3bc1d397aa7'
@@ -25,18 +23,12 @@ sha256sums=('0a6c3a30d4e20ddd5a561188b1da9be04d556e133368f13f033a0664d822d64a'
 backup=('etc/reposilite/configuration.cdn'
         'etc/reposilite/default.env')
 
-build() {
-  cd "$pkgname-$pkgver"
-  sed -i -r -e "s/(\\s+)version\\s*=.*/\\1version = \"$pkgver\"/" build.gradle.kts
-  JAVA_HOME="/usr/lib/jvm/java-19-openjdk" gradle :reposilite-backend:shadowJar --no-daemon --stacktrace
-}
-
 package() {
   install -Dm 644 $pkgname.service -t "${pkgdir}/usr/lib/systemd/system"
   install -Dm 644 $pkgname.sysusers "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
   install -Dm 644 $pkgname.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/$pkgname.conf"
-  install -Dm 644 $pkgname-$pkgver/reposilite-backend/build/libs/$pkgname-$pkgver.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
+  install -Dm 644 "$pkgname-$pkgver-all.jar" "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
   install -Dm 644 $pkgname.env "${pkgdir}/etc/reposilite/default.env"
-  /usr/lib/jvm/java-19-openjdk/bin/java -jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar" -wd "${pkgdir}/etc/reposilite" -gc configuration.cdn
+  java -jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar" -wd "${pkgdir}/etc/reposilite" -gc configuration.cdn
   install -Dm 755 $pkgname.wrapper "${pkgdir}/usr/bin/reposilite"
 }
diff --git a/update.sh b/update.sh
index e845d21fd867..cecabdfce779 100755
--- a/update.sh
+++ b/update.sh
@@ -24,16 +24,10 @@ done
 s_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 cd $s_dir
 
-git checkout master
 git pull -p --ff-only
 
-if git branch -r | grep release/ &>/dev/null; then
-    echo "Remote release branch detected ; will not create another, exiting"
-    exit
-fi
-
 build_ver=`grep ^pkgver= PKGBUILD | cut -d= -f2`
-release_ver=`curl --silent "https://api.github.com/repos/dzikoysk/reposilite/releases/latest" | jq -r .tag_name`
+release_ver=`curl --silent 'https://api.github.com/repos/dzikoysk/reposilite/releases/latest' | jq -r .tag_name`
 new_ver=`echo -e "$release_ver\n$build_ver" | sort -rV | head -n 1`
 
 if [ $new_ver = $build_ver -a "${initial}x" = "x" ] ; then
@@ -59,13 +53,12 @@ fi
 
 if [ "${initial}x" = "x" ] ; then
     makepkg --printsrcinfo > .SRCINFO
-    git checkout -b release/$new_ver
     git add PKGBUILD .SRCINFO
-    git commit -m "Released $new_ver"
-    git push -u origin release/$new_ver
-    gh pr create --title "Bump version to $new_ver" --body "Bump version to $new_ver" --assignee PolarianDev
-    git checkout master
-    git branch -D release/$new_ver
+    git commit -S -m "Released $new_ver-1"
+    git push
+    git tag -s -m "Bumped version $new_ver" "$new_ver-1"
+    git push --tags
+    gh release create --generate-notes "$new_ver-1" reposilite-$new_ver-1-any.pkg.tar.*
     rm reposilite-$new_ver.tar.*
     rm reposilite-$new_ver-1-any.pkg.tar.*
 fi