From 22c8b5c954a18c0599a8064c707bba93c0d6dda4 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Fri, 31 Dec 2021 15:18:47 +0100 Subject: [PATCH] This build is broken [CI SKIP] --- .woodpecker.yml | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 739f728..7929e92 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -11,7 +11,7 @@ pipeline: - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" - su builder # Build the package - - yes | makepkg -s --noconfirm --needed + - makepkg -s --noconfirm --needed publish: image: 'archlinux:latest' diff --git a/PKGBUILD b/PKGBUILD index 763b0cd..a8cb74f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -50,7 +50,7 @@ prepare() { cd "${srcdir}/joplin-${pkgver}" tar xvJf "${srcdir}/joplin-patches.tar.xz" patch -p1 < "${srcdir}/0005-All-Fixed-issue-where-synchroniser-would-try-to-upda.patch" - patch -R -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch" + patch -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch" msg2 "Tweaking lerna.json" local tmp_json="$(mktemp --tmpdir="$srcdir")"