Adding operating system support for yarn

david-dick · Feb 24, 2024 · d2af0b2 · d2af0b2
1 parent ebdf0ae
commit d2af0b2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 12 deletions.
diff --git a/setup-for-firefox-marionette-build.sh b/setup-for-firefox-marionette-build.sh
@@ -24,6 +24,7 @@ case $OSNAME in
 			fi
 			PACKAGES="dbus-x11 \
 						firefox \
+						git \
 						make \
 						mesa-dri-drivers \
 						nginx \
@@ -49,7 +50,8 @@ case $OSNAME in
 						perl-Test-Simple \
 						perl-XML-Parser \
 						squid \
-						xorg-x11-server-Xvfb"
+						xorg-x11-server-Xvfb \
+						yarnpkg"
 			rpm -q --quiet $PACKAGES || ${SUDO}$DNF install -y $PACKAGES
 			SOMETIMES_MISSING_PACKAGES="perl-Config-INI \
 						perl-DirHandle \
@@ -99,6 +101,7 @@ case $OSNAME in
 			fi
 			${SUDO}apt-get install -y \
 						dbus-x11 \
+						git \
 						libarchive-zip-perl \
 						libconfig-ini-perl \
 						libcrypt-urandom-perl \
@@ -117,15 +120,17 @@ case $OSNAME in
 						liburi-perl \
 						libxml-parser-perl \
 						make \
-                                                nginx \
-                                                openssh-server \
-                                                squid \
-						xvfb
+						nginx \
+						openssh-server \
+						squid \
+						xvfb \
+						yarnpkg
 		fi
 		if [ -e "/etc/alpine-release" ]
 		then
 			PACKAGES="dbus-x11 \
 				firefox \
+				git \
 				mesa-dri-nouveau \
 				nginx \
 				openssl \
@@ -148,7 +153,8 @@ case $OSNAME in
 				make \
 				squid \
 				xauth \
-				xvfb"
+				xvfb \
+				yarn"
 			INSTALL_PACKAGES=0
 			for PACKAGE_NAME in $PACKAGES
 			do
@@ -178,6 +184,7 @@ _APK_REPO_
 		;;
 	DragonFly)
 		PACKAGES="firefox \
+					git \
 					mesa-dri-gallium \
 					nginx \
 					openssl \
@@ -199,7 +206,8 @@ _APK_REPO_
 					p5-XML-Parser \
 					squid \
 					xauth \
-					xorg-vfbserver"
+					xorg-vfbserver \
+					yarn"
 		pkg info $PACKAGES >/dev/null || ${SUDO}pkg install -y $PACKAGES
 		if [ ! -e /etc/machine-id ]
 		then
@@ -208,6 +216,7 @@ _APK_REPO_
 		;;
 	FreeBSD)
 		PACKAGES="firefox \
+					git \
 					nginx \
 					openssl \
 					perl5 \
@@ -228,7 +237,8 @@ _APK_REPO_
 					p5-XML-Parser \
 					squid \
 					xauth \
-					xorg-vfbserver"
+					xorg-vfbserver \
+					yarn"
 		pkg info $PACKAGES >/dev/null || ${SUDO}pkg install -y $PACKAGES
 		mount | grep fdescfs >/dev/null || ${SUDO}mount -t fdescfs fdesc /dev/fd
 		if [ ! -e /etc/machine-id ]
@@ -238,7 +248,7 @@ _APK_REPO_
 		;;
 	OpenBSD)
 		PACKAGES="firefox \
-					firefox \
+					git \
 					nginx \
 					p5-Archive-Zip \
 					p5-JSON \
@@ -257,14 +267,18 @@ _APK_REPO_
 					p5-Sub-Install \
 					p5-Text-CSV_XS \
 					p5-XML-Parser \
-					squid"
+					squid \
+					yarn"
 		pkg_info $PACKAGES >/dev/null || ${SUDO}pkg_add -I $PACKAGES
 		perl -MConfig::INI -e 'exit 0' || PERL_MM_USE_DEFAULT=1 ${SUDO_WITH_ENVIRONMENT} cpan Config::INI
 		perl -MCrypt::URandom -e 'exit 0' || PERL_MM_USE_DEFAULT=1 ${SUDO_WITH_ENVIRONMENT} cpan Crypt::URandom
 		;;
 	NetBSD)
 		PKG_PATH="http://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/$(uname -r|cut -f '1 2' -d.)/All/"
+		export PKG_PATH
+		${SUDO}pkg_add pkgin
 		PACKAGES="firefox \
+					git \
 					nginx \
 					openssl \
 					p5-Archive-Zip \
@@ -284,8 +298,10 @@ _APK_REPO_
 					p5-Sub-Install \
 					p5-Text-CSV_XS \
 					p5-XML-Parser \
-					squid"
+					squid \
+					yarn"
 		INSTALL_PACKAGES=""
+		${SUDO}pkgin upgrade
 		for NAME in $PACKAGES
 		do
 			pkgin list | grep $NAME >/dev/null 2>/dev/null || INSTALL_PACKAGES="$INSTALL_PACKAGES $NAME"

diff --git a/t/test_daemons.pm b/t/test_daemons.pm
@@ -966,7 +966,8 @@ use English qw( -no_match_vars );
 
 sub _CONVERT_TO_PROCESS_GROUP { return -1 }
 
-my $yarn_binary = __PACKAGE__->find_binary('yarn');
+my $yarn_binary =
+  __PACKAGE__->find_binary('yarnpkg') || __PACKAGE__->find_binary('yarn');
 
 sub botd_available {
     my $cwd;