From 745b9efd3b5cab27ad51fe0589463100915996b2 Mon Sep 17 00:00:00 2001
From: Lukas Holzer <lukas.holzer@netlify.com>
Date: Mon, 17 Oct 2022 17:03:21 +0200
Subject: [PATCH] fix: incorporate breaking change in install_dependencies
 order (#846)

* fix: incorporate breaking change in install_dependencies order

* chore: fix typo
---
 run-build-functions.sh   | 7 ++++---
 run-build.sh             | 3 ++-
 test-tools/test-build.sh | 2 ++
 xenial.yaml              | 6 ------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/run-build-functions.sh b/run-build-functions.sh
index 27c452fa..9bda595d 100755
--- a/run-build-functions.sh
+++ b/run-build-functions.sh
@@ -240,9 +240,10 @@ install_dependencies() {
   local defaultNodeVersion=$1
   local defaultRubyVersion=$2
   local defaultYarnVersion=$3
-  local installGoVersion=$4
-  local defaultPythonVersion=$5
-  local featureFlags="$6"
+  local defaultPnpmVersion=$4 # unused on xenial (we won't add support for pnpm here anymore just in focal)
+  local installGoVersion=$5
+  local defaultPythonVersion=$6
+  local featureFlags="$7"
 
   # Python Version
   if [ -f runtime.txt ]
diff --git a/run-build.sh b/run-build.sh
index 0152f220..4f0cc53a 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -21,11 +21,12 @@ cd $NETLIFY_REPO_DIR
 : ${NODE_VERSION="12.18.0"}
 : ${RUBY_VERSION="2.7.1"}
 : ${YARN_VERSION="1.22.4"}
+: ${PNPM_VERSION="7.13.4"}
 : ${GO_VERSION="1.14.4"}
 : ${PYTHON_VERSION="2.7"}
 
 echo "Installing dependencies"
-install_dependencies $NODE_VERSION $RUBY_VERSION $YARN_VERSION $GO_VERSION $PYTHON_VERSION
+install_dependencies $NODE_VERSION $RUBY_VERSION $YARN_VERSION $PNPM_VERSION $GO_VERSION $PYTHON_VERSION
 
 echo "Installing missing commands"
 install_missing_commands
diff --git a/test-tools/test-build.sh b/test-tools/test-build.sh
index cc24b05d..5130c3c7 100755
--- a/test-tools/test-build.sh
+++ b/test-tools/test-build.sh
@@ -19,6 +19,7 @@ fi
 : ${NODE_VERSION="10"}
 : ${RUBY_VERSION="2.6.2"}
 : ${YARN_VERSION="1.13.0"}
+: ${PNPM_VERSION="7.13.4"}
 : ${NPM_VERSION=""}
 : ${HUGO_VERSION="0.54.0"}
 : ${PHP_VERSION="5.6"}
@@ -48,6 +49,7 @@ docker run --rm \
        -e RUBY_VERSION \
        -e YARN_VERSION \
        -e NPM_VERSION \
+       -e PNPM_VERSION \
        -e HUGO_VERSION \
        -e PHP_VERSION \
        -e NETLIFY_VERBOSE \
diff --git a/xenial.yaml b/xenial.yaml
index 8338047a..3b1a5577 100644
--- a/xenial.yaml
+++ b/xenial.yaml
@@ -119,12 +119,6 @@ commandTests:
     args: ["--version"]
     expectedOutput: ["swiftenv 1.5.0"]
 
-  - name: "Homebrew"
-    command: "brew"
-    args: ["--version"]
-    expectedOutput:
-      - Homebrew 3\.5\.\d+
-
   - name: "Rustup"
     command: "rustup"
     args: ["--version"]