Update binary package version, build with local dependency 'roadrunner-plugins'

2 files changed, 18 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eee30050e117..bf2c39c18517 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = roadrunner
 	pkgdesc = High-performance PHP application server, load-balancer and process manager written in Golang
 	pkgver = 2.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://roadrunner.dev/
 	arch = x86_64
 	license = MIT
@@ -10,11 +10,13 @@ pkgbase = roadrunner
 	depends = php>=7.3
 	options = !buildflags
 	source = roadrunner-2.6.0.tar.gz::https://github.com/spiral/roadrunner/archive/v2.6.0.tar.gz
-	source = roadrunner-binary-2.6.0.tar.gz::https://github.com/spiral/roadrunner-binary/archive/v2.6.0.tar.gz
+	source = roadrunner-binary-2.6.1.tar.gz::https://github.com/spiral/roadrunner-binary/archive/v2.6.1.tar.gz
+	source = roadrunner-plugins-2.6.1.tar.gz::https://github.com/spiral/roadrunner-plugins/archive/v2.6.1.tar.gz
 	source = .rr.yaml.sample-full
 	source = .rr.yaml.sample-minimal
 	sha256sums = dd6a42513252480e749b45fb99b118cfdc01be1ff393820f954c236227ffd191
-	sha256sums = a951f9e6a5fd56d0003e2ae72c8dffa5c862378efa98dc1419d0737f510e7e68
+	sha256sums = 74882ab87a96a452595469297a0bdcaa5c4e39a943a93af2140c7224501b3b76
+	sha256sums = 97490ee73fc86e227dbc3217642109255e114e64c1a2323e37a7282b2a79677b
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 381869895f1e..52e92a1a8e00 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Leo <i@setuid0.dev>
 
-_bin_ver=2.6.0
 _rr_ver=2.6.0
+_binary_ver=2.6.1
+_plugins_ver=2.6.1
 
 pkgname=roadrunner
 pkgver=$_rr_ver
-pkgrel=1
+pkgrel=2
 pkgdesc="High-performance PHP application server, load-balancer and process manager written in Golang"
 arch=(x86_64)
 url="https://roadrunner.dev/"
@@ -14,13 +15,15 @@ depends=("php>=7.3")
 makedepends=("go>=1.16" "composer")
 source=(
 	"$pkgname-$_rr_ver.tar.gz::https://github.com/spiral/$pkgname/archive/v$_rr_ver.tar.gz"
-	"$pkgname-binary-$_bin_ver.tar.gz::https://github.com/spiral/$pkgname-binary/archive/v$_bin_ver.tar.gz"
+	"$pkgname-binary-$_binary_ver.tar.gz::https://github.com/spiral/$pkgname-binary/archive/v$_binary_ver.tar.gz"
+	"$pkgname-plugins-$_plugins_ver.tar.gz::https://github.com/spiral/$pkgname-plugins/archive/v$_binary_ver.tar.gz"
 	".rr.yaml.sample-full"
 	".rr.yaml.sample-minimal"
 )
 sha256sums=(
 	'dd6a42513252480e749b45fb99b118cfdc01be1ff393820f954c236227ffd191'
-	'a951f9e6a5fd56d0003e2ae72c8dffa5c862378efa98dc1419d0737f510e7e68'
+	'74882ab87a96a452595469297a0bdcaa5c4e39a943a93af2140c7224501b3b76'
+	'97490ee73fc86e227dbc3217642109255e114e64c1a2323e37a7282b2a79677b'
 	SKIP
 	SKIP
 )
@@ -29,8 +32,9 @@ options=("!buildflags")
 prepare() {
 	export GOPATH="$srcdir"/gopath
 
-	cd "$srcdir/$pkgname-binary-$_bin_ver"
+	cd "$srcdir/$pkgname-binary-$_binary_ver"
 	go mod edit -replace "github.com/spiral/roadrunner/v2=../roadrunner-$_rr_ver"
+	go mod edit -replace "github.com/spiral/roadrunner-plugins/v2=../roadrunner-plugins-$_plugins_ver"
 	go mod tidy
 	go mod download
 }
@@ -42,12 +46,12 @@ build() {
 	export CGO_CXXFLAGS="${CXXFLAGS}"
 	export CGO_LDFLAGS="${LDFLAGS}"
 
-	cd "$srcdir/$pkgname-binary-$_bin_ver"
+	cd "$srcdir/$pkgname-binary-$_binary_ver"
 
 	CGO_ENABLED=0 go build \
 		-trimpath \
 		-ldflags "-s\
-		 -X github.com/spiral/roadrunner-binary/v2/internal/meta.version=${_bin_ver}\
+		 -X github.com/spiral/roadrunner-binary/v2/internal/meta.version=${_rr_ver}\
 		 -X github.com/spiral/roadrunner-binary/v2/internal/meta.buildTime=$(date +%FT%T%z)" \
 		-o ./rr \
 		./cmd/rr
@@ -62,12 +66,12 @@ check() {
 	mkdir ./coverage-ci
 	go test -race -covermode=atomic -coverprofile ./coverage.txt ./...
 
-	cd "$srcdir/$pkgname-binary-$_bin_ver"
+	cd "$srcdir/$pkgname-binary-$_binary_ver"
 	go test -race -covermode=atomic -coverprofile ./coverage.txt ./...
 }
 
 package() {
-	install -Dt "$pkgdir/usr/bin/" -m755 "$srcdir/$pkgname-binary-$_bin_ver/rr"
+	install -Dt "$pkgdir/usr/bin/" -m755 "$srcdir/$pkgname-binary-$_binary_ver/rr"
 	install -Dt "$pkgdir/usr/share/$pkgname/" -m644 "$srcdir/.rr.yaml.sample-full"
 	install -Dt "$pkgdir/usr/share/$pkgname/" -m644 "$srcdir/.rr.yaml.sample-minimal"
 }