Skip to content

Commit 4cd9f32

Browse files
committed
debian: use yarnpkg instead of manually installed yarn from repo
1 parent 6fdad8d commit 4cd9f32

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

debian/control

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ Source: yunohost-admin
22
Section: utils
33
Priority: extra
44
Maintainer: YunoHost Contributors <contrib@yunohost.org>
5-
Build-Depends: debhelper (>=12), debhelper-compat (= 13)
6-
, nodejs (>=10.15.2), git, curl
5+
Build-Depends: debhelper (>=12), debhelper-compat (= 13), nodejs (>=10.15.2), yarnpkg
76
Standards-Version: 3.9.6
87
Homepage: https://yunohost.org/
98

debian/rules

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,8 @@ TMPDIR = $$(pwd)/debian/yunohost-admin
1515
dh $@
1616

1717
override_dh_auto_build:
18-
/usr/bin/curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | tee /usr/share/keyrings/nodesource.gpg >/dev/null
19-
/usr/bin/curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/yarn.gpg >/dev/null
20-
echo 'deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_14.x bookworm main' > /etc/apt/sources.list.d/nodesource.list
21-
echo "deb [signed-by=/etc/apt/trusted.gpg.d/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
22-
/usr/bin/apt update
23-
/usr/bin/apt install nodejs yarn -y
24-
cd app ; /usr/bin/yarn install --frozen-lockfile --non-interactive
25-
cd app ; /usr/bin/yarn build
18+
cd app; yarnpkg install --frozen-lockfile --non-interactive
19+
cd app; yarnpkg build
2620

2721

2822
override_dh_clean:

0 commit comments

Comments
 (0)