New upstream version 2.7.2

update dependencies

2 files changed, 18 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e577d0ee7832..b13cafb07a25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,17 @@
 pkgbase = roadrunner
 	pkgdesc = High-performance PHP application server, load-balancer and process manager written in Golang
-	pkgver = 2.7.1
+	pkgver = 2.7.2
 	pkgrel = 1
 	url = https://roadrunner.dev/
 	arch = x86_64
 	license = MIT
-	makedepends = go>=1.16
-	makedepends = composer
-	depends = php>=7.3
+	makedepends = go>=1.17
+	depends = php>=7.4
 	options = !buildflags
-	source = roadrunner-2.7.1.tar.gz::https://github.com/spiral/roadrunner/archive/v2.7.1.tar.gz
-	source = roadrunner-binary-2.7.0.tar.gz::https://github.com/spiral/roadrunner-binary/archive/v2.7.0.tar.gz
-	source = roadrunner-plugins-2.7.1.tar.gz::https://github.com/spiral/roadrunner-plugins/archive/v2.7.1.tar.gz
+	source = roadrunner-2.7.2.tar.gz::https://github.com/spiral/roadrunner/archive/v2.7.2.tar.gz
 	source = .rr.yaml.sample-full
 	source = .rr.yaml.sample-minimal
-	sha256sums = ad6a4bbcbf5731d552f36a5b4637035199c2c570d0a1c500ee2abbc13b60347a
-	sha256sums = b4b96126d5098dfb3f5adfed0e0a65cb3fb83237d7fda3af13e4fbb8c0004363
-	sha256sums = 2ee53609c79a0dad9409acbbdfc8fb9f6bd70c40783319304d693c5ae2026c11
+	sha256sums = ad5c1b94e29482ea9cc924a9cdeafa3678a47e68278af99c438d9cec86d46040
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 629cb8e3dd6a..e71de83d4fb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,21 @@
 # Maintainer: Leo <i@setuid0.dev>
 
-_rr_ver=2.7.1
-_binary_ver=2.7.0
-_plugins_ver=2.7.1
-
 pkgname=roadrunner
-pkgver=$_rr_ver
+pkgver=2.7.2
 pkgrel=1
 pkgdesc="High-performance PHP application server, load-balancer and process manager written in Golang"
 arch=(x86_64)
 url="https://roadrunner.dev/"
 license=(MIT)
-depends=("php>=7.3")
-makedepends=("go>=1.16" "composer")
+depends=("php>=7.4")
+makedepends=("go>=1.17")
 source=(
-	"$pkgname-$_rr_ver.tar.gz::https://github.com/spiral/$pkgname/archive/v$_rr_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$_plugins_ver.tar.gz"
+	"$pkgname-$pkgver.tar.gz::https://github.com/spiral/$pkgname/archive/v$pkgver.tar.gz"
 	".rr.yaml.sample-full"
 	".rr.yaml.sample-minimal"
 )
 sha256sums=(
-	'ad6a4bbcbf5731d552f36a5b4637035199c2c570d0a1c500ee2abbc13b60347a'
-	'b4b96126d5098dfb3f5adfed0e0a65cb3fb83237d7fda3af13e4fbb8c0004363'
-	'2ee53609c79a0dad9409acbbdfc8fb9f6bd70c40783319304d693c5ae2026c11'
+	'ad5c1b94e29482ea9cc924a9cdeafa3678a47e68278af99c438d9cec86d46040'
 	SKIP
 	SKIP
 )
@@ -32,11 +24,9 @@ options=("!buildflags")
 prepare() {
 	export GOPATH="$srcdir"/gopath
 
-	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
+	cd "$srcdir/$pkgname-$pkgver"
 	go mod download
+	go mod verify
 }
 
 build() {
@@ -46,32 +36,26 @@ build() {
 	export CGO_CXXFLAGS="${CXXFLAGS}"
 	export CGO_LDFLAGS="${LDFLAGS}"
 
-	cd "$srcdir/$pkgname-binary-$_binary_ver"
+	cd "$srcdir/$pkgname-$pkgver"
 
 	CGO_ENABLED=0 go build \
 		-trimpath \
 		-ldflags "-s\
-		 -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)" \
+		 -X github.com/roadrunner-server/roadrunner/v2/internal/meta.version=${pkgver}\
+		 -X github.com/roadrunner-server/roadrunner/v2/internal/meta.buildTime=$(date +%FT%T%z)" \
 		-o ./rr \
 		./cmd/rr
 }
 
 check() {
-	cd "$srcdir/$pkgname-$_rr_ver/tests"
-	composer update --prefer-dist --no-progress --ansi
-
-	cd "$srcdir/$pkgname-$_rr_ver"
-	rm -rf coverage-ci
-	mkdir ./coverage-ci
-	go test -race -covermode=atomic -coverprofile ./coverage.txt ./...
+	export GOPATH="$srcdir"/gopath
 
-	cd "$srcdir/$pkgname-binary-$_binary_ver"
+	cd "$srcdir/$pkgname-$pkgver"
 	go test -race -covermode=atomic -coverprofile ./coverage.txt ./...
 }
 
 package() {
-	install -Dt "$pkgdir/usr/bin/" -m755 "$srcdir/$pkgname-binary-$_binary_ver/rr"
+	install -Dt "$pkgdir/usr/bin/" -m755 "$srcdir/$pkgname-$pkgver/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"
 }