diff --git a/woodpecker/.SRCINFO b/woodpecker/.SRCINFO index 79cc7c4..6f864d7 100644 --- a/woodpecker/.SRCINFO +++ b/woodpecker/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = woodpecker pkgdesc = Woodpecker is a community fork of the Drone CI system - pkgver = 0.15.0+730+g264f12fb5 + pkgver = 1.0.0 pkgrel = 1 url = https://woodpecker-ci.org arch = x86_64 @@ -10,14 +10,12 @@ pkgbase = woodpecker makedepends = nodejs-lts-hydrogen makedepends = npm options = !lto - source = git+https://github.com/woodpecker-ci/woodpecker.git - source = Add-global-user-secret.patch + source = git+https://github.com/woodpecker-ci/woodpecker.git#tag=v1.0.0 source = woodpecker-server.service source = woodpecker-agent.service source = agent.conf source = server.conf sha256sums = SKIP - sha256sums = afe322fd6b72097fc6d80352832daeb8bc9c30b2380c252d129d3c487ddc631d sha256sums = 6e22e6939222aaad07311e37a086935ca32dd149c3688b2809db5f55df816516 sha256sums = 7a72ba21f385b5dcf7f2d4e8fb7a643070eb2cf722187ca1ec69a9d04b003e9e sha256sums = b6bf640e6649b991451bbd006b6e267f24fc49f51cf77251c9c33e7ebdd51014 diff --git a/woodpecker/Add-global-user-secret.patch b/woodpecker/Add-global-user-secret.patch deleted file mode 100644 index fb27dc2..0000000 --- a/woodpecker/Add-global-user-secret.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8a08a7a35c743fabee395d9a9b50df596095804f Mon Sep 17 00:00:00 2001 -From: nyyu -Date: Mon, 26 Dec 2022 19:21:15 +0100 -Subject: [PATCH] Add global user secret - ---- - server/api/org.go | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/server/api/org.go b/server/api/org.go -index e79a3ae3..5f45c060 100644 ---- a/server/api/org.go -+++ b/server/api/org.go -@@ -37,6 +37,11 @@ func GetOrgPermissions(c *gin.Context) { - return - } - -+ if user.Login == owner { -+ c.JSON(http.StatusOK, &model.OrgPerm{Member: true, Admin: true}) -+ return -+ } -+ - perm, err := server.Config.Services.Membership.Get(c, user, owner) - if err != nil { - c.String(http.StatusInternalServerError, "Error getting membership for %q. %s", owner, err) --- -2.39.0 - diff --git a/woodpecker/PKGBUILD b/woodpecker/PKGBUILD index e82d185..854a91f 100644 --- a/woodpecker/PKGBUILD +++ b/woodpecker/PKGBUILD @@ -6,7 +6,7 @@ pkgname=( 'woodpecker-agent' 'woodpecker-cli' ) -pkgver=0.15.0+730+g264f12fb5 +pkgver=1.0.0 pkgrel=1 pkgdesc="Woodpecker is a community fork of the Drone CI system" arch=('x86_64') @@ -14,14 +14,12 @@ url="https://woodpecker-ci.org" license=('Apache') makedepends=('go' 'git' 'nodejs-lts-hydrogen' 'npm') options=('!lto') -source=(git+https://github.com/woodpecker-ci/woodpecker.git - 'Add-global-user-secret.patch' +source=(git+https://github.com/woodpecker-ci/woodpecker.git#tag=v$pkgver 'woodpecker-server.service' 'woodpecker-agent.service' 'agent.conf' 'server.conf') sha256sums=('SKIP' - 'afe322fd6b72097fc6d80352832daeb8bc9c30b2380c252d129d3c487ddc631d' '6e22e6939222aaad07311e37a086935ca32dd149c3688b2809db5f55df816516' '7a72ba21f385b5dcf7f2d4e8fb7a643070eb2cf722187ca1ec69a9d04b003e9e' 'b6bf640e6649b991451bbd006b6e267f24fc49f51cf77251c9c33e7ebdd51014'