Skip to content
This repository has been archived by the owner on Jan 25, 2023. It is now read-only.

Commit

Permalink
fix: incorporate breaking change in install_dependencies order (#846)
Browse files Browse the repository at this point in the history
* fix: incorporate breaking change in install_dependencies order

* chore: fix typo
  • Loading branch information
lukasholzer authored Oct 17, 2022
1 parent 1ac2360 commit 745b9ef
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
7 changes: 4 additions & 3 deletions run-build-functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down
3 changes: 2 additions & 1 deletion run-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test-tools/test-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down Expand Up @@ -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 \
Expand Down
6 changes: 0 additions & 6 deletions xenial.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down

0 comments on commit 745b9ef

Please sign in to comment.