add arch to installer script (#158)

actions · Nov 8, 2023 · a798c8e · a798c8e
1 parent 9d10c5b
commit a798c8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/builders/nix-node-builder.psm1 b/builders/nix-node-builder.psm1
@@ -54,7 +54,7 @@ class NixNodeBuilder : NodeBuilder {
         $installationTemplateLocation = Join-Path -Path $this.InstallationTemplatesLocation -ChildPath $this.InstallationTemplateName
 
         $installationTemplateContent = Get-Content -Path $installationTemplateLocation -Raw
-        $installationTemplateContent = $installationTemplateContent -f $this.Version.ToString(3)
+        $installationTemplateContent = $installationTemplateContent -f $this.Version.ToString(3), $this.Architecture
         $installationTemplateContent | Out-File -FilePath $installationScriptLocation
 
         Write-Debug "Done; Installation script location: $installationScriptLocation)"

diff --git a/installers/nix-setup-template.sh b/installers/nix-setup-template.sh
@@ -1,10 +1,11 @@
 set -e
 
 NODE_VERSION={0}
+ARCH={1}
 
 NODE_TOOLCACHE_PATH=$AGENT_TOOLSDIRECTORY/node
 NODE_TOOLCACHE_VERSION_PATH=$NODE_TOOLCACHE_PATH/$NODE_VERSION
-NODE_TOOLCACHE_VERSION_ARCH_PATH=$NODE_TOOLCACHE_VERSION_PATH/x64
+NODE_TOOLCACHE_VERSION_ARCH_PATH=$NODE_TOOLCACHE_VERSION_PATH/$ARCH
 
 echo "Check if Node.js hostedtoolcache folder exist..."
 if [ ! -d $NODE_TOOLCACHE_PATH ]; then
@@ -22,4 +23,4 @@ cp -R ./* $NODE_TOOLCACHE_VERSION_ARCH_PATH
 rm $NODE_TOOLCACHE_VERSION_ARCH_PATH/setup.sh
 
 echo "Create complete file"
-touch $NODE_TOOLCACHE_VERSION_PATH/x64.complete
+touch $NODE_TOOLCACHE_VERSION_PATH/$ARCH.complete