Skip to content

Commit a798c8e

Browse files
add arch to installer script (#158)
1 parent 9d10c5b commit a798c8e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

builders/nix-node-builder.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class NixNodeBuilder : NodeBuilder {
5454
$installationTemplateLocation = Join-Path -Path $this.InstallationTemplatesLocation -ChildPath $this.InstallationTemplateName
5555

5656
$installationTemplateContent = Get-Content -Path $installationTemplateLocation -Raw
57-
$installationTemplateContent = $installationTemplateContent -f $this.Version.ToString(3)
57+
$installationTemplateContent = $installationTemplateContent -f $this.Version.ToString(3), $this.Architecture
5858
$installationTemplateContent | Out-File -FilePath $installationScriptLocation
5959

6060
Write-Debug "Done; Installation script location: $installationScriptLocation)"

installers/nix-setup-template.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
set -e
22

33
NODE_VERSION={0}
4+
ARCH={1}
45

56
NODE_TOOLCACHE_PATH=$AGENT_TOOLSDIRECTORY/node
67
NODE_TOOLCACHE_VERSION_PATH=$NODE_TOOLCACHE_PATH/$NODE_VERSION
7-
NODE_TOOLCACHE_VERSION_ARCH_PATH=$NODE_TOOLCACHE_VERSION_PATH/x64
8+
NODE_TOOLCACHE_VERSION_ARCH_PATH=$NODE_TOOLCACHE_VERSION_PATH/$ARCH
89

910
echo "Check if Node.js hostedtoolcache folder exist..."
1011
if [ ! -d $NODE_TOOLCACHE_PATH ]; then
@@ -22,4 +23,4 @@ cp -R ./* $NODE_TOOLCACHE_VERSION_ARCH_PATH
2223
rm $NODE_TOOLCACHE_VERSION_ARCH_PATH/setup.sh
2324

2425
echo "Create complete file"
25-
touch $NODE_TOOLCACHE_VERSION_PATH/x64.complete
26+
touch $NODE_TOOLCACHE_VERSION_PATH/$ARCH.complete

0 commit comments

Comments
 (0)