Skip to content

Commit 07159b1

Browse files
Merge pull request #606 from mcottontensor/backport/LatencyTest/pr-604
[LatencyTest] Fixing more path issues in platform_scripts (#604)
2 parents 5dbf362 + d86e50c commit 07159b1

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/healthcheck-platform-scripts.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,3 @@ jobs:
4343
run: |
4444
Start-Process -NoNewWindow ".\platform_scripts\cmd\start.bat" -ArgumentList "--rest_api","--player_port 999"
4545
curl --retry 10 --retry-delay 20 --retry-connrefused http://localhost:999/api/status
46-

SignallingWebServer/platform_scripts/bash/common.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ function setup_node() {
168168
# navigate to project root
169169
pushd "${SCRIPT_DIR}/../../.." > /dev/null
170170

171+
# setup the path so we're using our node. required when calling npm
172+
PATH="${SCRIPT_DIR}/node/bin:$PATH"
173+
171174
node_version=""
172175
if [[ -f "${SCRIPT_DIR}/node/bin/node" ]]; then
173176
node_version=$("${SCRIPT_DIR}/node/bin/node" --version)
@@ -187,14 +190,13 @@ function setup_node() {
187190
else
188191
node_url="https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-linux-x64.tar.gz"
189192
fi
190-
check_and_install "node" "$node_version" "$NODE_VERSION" "curl $node_url --output node.tar.xz
193+
check_and_install "${SCRIPT_DIR}/node/bin/node" "$node_version" "$NODE_VERSION" "curl $node_url --output node.tar.xz
191194
&& tar -xf node.tar.xz
192195
&& rm node.tar.xz
193196
&& mv node-v*-*-* \"${SCRIPT_DIR}/node\""
194197

195198
if [ $? -eq 1 ] || [ "$INSTALL_DEPS" == "1" ]; then
196199
echo "Installing dependencies..."
197-
PATH="${SCRIPT_DIR}/node/bin:$PATH"
198200
"${NPM}" install
199201
fi
200202

0 commit comments

Comments
 (0)