From bb898e421ef83476225eb4df27ef4dc0a335abc4 Mon Sep 17 00:00:00 2001
From: nyyu <mail@nyyu.dev>
Date: Sat, 25 Nov 2023 11:20:02 +0100
Subject: [PATCH] fix: wp

---
 woodpecker/.SRCINFO             |  6 +++---
 woodpecker/PKGBUILD             | 12 ++++++------
 woodpecker/agent.conf           |  2 +-
 woodpecker/fix-encryption.patch | 31 +++++++++++++++++++++++--------
 4 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/woodpecker/.SRCINFO b/woodpecker/.SRCINFO
index 49a6fbc..a510199 100644
--- a/woodpecker/.SRCINFO
+++ b/woodpecker/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = woodpecker
 	pkgdesc = Woodpecker is a community fork of the Drone CI system
 	pkgver = 2.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://woodpecker-ci.org
 	arch = x86_64
 	license = Apache
@@ -17,10 +17,10 @@ pkgbase = woodpecker
 	source = agent.conf
 	source = server.conf
 	sha256sums = SKIP
-	sha256sums = caed32618c98fd403441ef67626d42df51c0b13852ac0e69cd274d4fb220d114
+	sha256sums = 51ef81bb925ca4fa5db4ecacaa9377baf673454632aecd0485e3dac801d72647
 	sha256sums = 6e22e6939222aaad07311e37a086935ca32dd149c3688b2809db5f55df816516
 	sha256sums = 7a72ba21f385b5dcf7f2d4e8fb7a643070eb2cf722187ca1ec69a9d04b003e9e
-	sha256sums = b6bf640e6649b991451bbd006b6e267f24fc49f51cf77251c9c33e7ebdd51014
+	sha256sums = 5fd0216af98bc12983d628fe165d0f0896caf583fd3d0fd6cb30c68a599dc9fa
 	sha256sums = d983da1df22d00338aa82be5844554f27f789361f405fe381f73896623bd2c7a
 
 pkgname = woodpecker-server
diff --git a/woodpecker/PKGBUILD b/woodpecker/PKGBUILD
index 505a459..9d30039 100644
--- a/woodpecker/PKGBUILD
+++ b/woodpecker/PKGBUILD
@@ -7,12 +7,12 @@ pkgname=(
   'woodpecker-cli'
 )
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Woodpecker is a community fork of the Drone CI system"
 arch=('x86_64')
 url="https://woodpecker-ci.org"
 license=('Apache')
-makedepends=('go' 'git' 'nodejs-lts-hydrogen' 'npm')
+makedepends=('go' 'git' 'pnpm')
 options=('!lto')
 source=(git+https://github.com/woodpecker-ci/woodpecker.git#tag=v$pkgver
     'fix-encryption.patch'
@@ -21,10 +21,10 @@ source=(git+https://github.com/woodpecker-ci/woodpecker.git#tag=v$pkgver
     'agent.conf'
     'server.conf')
 sha256sums=('SKIP'
-            'caed32618c98fd403441ef67626d42df51c0b13852ac0e69cd274d4fb220d114'
+            '51ef81bb925ca4fa5db4ecacaa9377baf673454632aecd0485e3dac801d72647'
             '6e22e6939222aaad07311e37a086935ca32dd149c3688b2809db5f55df816516'
             '7a72ba21f385b5dcf7f2d4e8fb7a643070eb2cf722187ca1ec69a9d04b003e9e'
-            'b6bf640e6649b991451bbd006b6e267f24fc49f51cf77251c9c33e7ebdd51014'
+            '5fd0216af98bc12983d628fe165d0f0896caf583fd3d0fd6cb30c68a599dc9fa'
             'd983da1df22d00338aa82be5844554f27f789361f405fe381f73896623bd2c7a')
 
 prepare() {
@@ -54,8 +54,8 @@ build() {
     )
 
     cd web
-    npm install
-    npm run build
+    pnpm install --frozen-lockfile
+    pnpm build
     cd ..
 
     go build \
diff --git a/woodpecker/agent.conf b/woodpecker/agent.conf
index 78622fe..4d03c11 100644
--- a/woodpecker/agent.conf
+++ b/woodpecker/agent.conf
@@ -3,5 +3,5 @@
 WOODPECKER_SERVER=localhost:9992
 WOODPECKER_AGENT_SECRET=""
 WOODPECKER_HEALTHCHECK=false
-# WOODPECKER_MAX_PROCS=4
+# WOODPECKER_MAX_WORKFLOWS=4
 WOODPECKER_BACKEND=docker
diff --git a/woodpecker/fix-encryption.patch b/woodpecker/fix-encryption.patch
index 0faf7ea..2584b3a 100644
--- a/woodpecker/fix-encryption.patch
+++ b/woodpecker/fix-encryption.patch
@@ -1,17 +1,18 @@
-From e85ff99be5887dd3dc21edbe29fcec4a3c737c01 Mon Sep 17 00:00:00 2001
+From e231fe4739b06e2cb4a4973d77ea7ca1c64b51db Mon Sep 17 00:00:00 2001
 From: nyyu <mail@nyyu.dev>
-Date: Sun, 19 Nov 2023 19:43:25 +0100
+Date: Sat, 25 Nov 2023 10:51:33 +0100
 Subject: [PATCH] fix: encryption
 
 ---
- cmd/server/server.go | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
+ cmd/server/server.go                    | 18 +++++++++---------
+ server/plugins/encryption/encryption.go |  2 ++
+ 2 files changed, 11 insertions(+), 9 deletions(-)
 
 diff --git a/cmd/server/server.go b/cmd/server/server.go
-index c35e39293..495c11436 100644
+index fae4f9b21..541544907 100644
 --- a/cmd/server/server.go
 +++ b/cmd/server/server.go
-@@ -50,8 +50,8 @@ import (
+@@ -51,8 +51,8 @@ import (
  	"go.woodpecker-ci.org/woodpecker/server/web"
  	"go.woodpecker-ci.org/woodpecker/shared/constant"
  	"go.woodpecker-ci.org/woodpecker/version"
@@ -22,7 +23,7 @@ index c35e39293..495c11436 100644
  )
  
  func run(c *cli.Context) error {
-@@ -288,13 +288,13 @@ func setupEvilGlobals(c *cli.Context, v store.Store, f forge.Forge) {
+@@ -279,13 +279,13 @@ func setupEvilGlobals(c *cli.Context, v store.Store, f forge.Forge) {
  
  	// TODO(1544): fix encrypted store
  	// // encryption
@@ -43,6 +44,20 @@ index c35e39293..495c11436 100644
  
  	server.Config.Services.Environ = setupEnvironService(c, v)
  	server.Config.Services.Membership = setupMembershipService(c, f)
+diff --git a/server/plugins/encryption/encryption.go b/server/plugins/encryption/encryption.go
+index f0e30db5c..8d9a1462c 100644
+--- a/server/plugins/encryption/encryption.go
++++ b/server/plugins/encryption/encryption.go
+@@ -56,7 +56,9 @@ func (b builder) Build() error {
+ 		if err != nil {
+ 			return fmt.Errorf(errTemplateFailedInitializingUnencrypted, err)
+ 		}
++        return nil
+ 	}
++
+ 	svc, err := b.getService(keyType)
+ 	if err != nil {
+ 		return fmt.Errorf(errTemplateFailedInitializing, err)
 -- 
-2.42.1
+2.43.0