Skip to content

Add nodejs tool cache for linux. #839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxim-lobanov merged 17 commits into from
May 9, 2020
Merged

Add nodejs tool cache for linux. #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
67b2849
add nodejs
May 5, 2020
a10ad29
timed remove validation script
May 5, 2020
95eac1b
minor fix
May 5, 2020
0f2220d
temporary remove validate-disk-space
May 5, 2020
c64521f
return validation
May 5, 2020
11ddf91
lowercase naming
May 6, 2020
cbed0a6
fix naming
May 6, 2020
334cca3
return validate-disk-space
May 6, 2020
cad9df9
Merge remote-tracking branch 'origin' into v-dmshib/nodejs-toolcache-…
May 7, 2020
8d41821
remove 8 version
May 7, 2020
754241d
update disk size
May 7, 2020
8166d9b
move to 17500
May 7, 2020
b0f8b71
add 8 node version
May 8, 2020
e9491ca
mv validation scripts 2 nodes
May 8, 2020
dfa6307
return 18000
May 8, 2020
9c1c99b
4 node versions
May 8, 2020
03b9afa
Merge remote-tracking branch 'origin' into v-dmshib/nodejs-toolcache-…
May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion images/linux/scripts/installers/Install-Toolset.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,5 @@ foreach ($tool in $tools) {
}
}

chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/Python
chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/Python
chown -R "$($env:SUDO_USER):$($env:SUDO_USER)" /opt/hostedtoolcache/node
5 changes: 4 additions & 1 deletion images/linux/scripts/installers/Validate-Toolset.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ function Run-ExecutableTests {
$ErrorActionPreference = "Stop"

# Define executables for cached tools
$toolsExecutables = @{ Python = @("python", "bin/pip") }
$toolsExecutables = @{
Python = @("python", "bin/pip");
node = @("bin/node", "bin/npm")
}

# Get toolset content
$toolsetJson = Get-Content -Path "$env:INSTALLER_SCRIPT_FOLDER/toolset.json" -Raw
Expand Down
12 changes: 12 additions & 0 deletions images/linux/toolset-1604.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@
"3.7.*",
"3.8.*"
]
},
{
"name": "node",
"url" : "https://raw.githubusercontent.com/actions/node-versions/master/versions-manifest.json",
"platform" : "linux",
"arch": "x64",
"versions": [
"8.*",
"10.*",
"12.*",
"14.*"
]
}
]
}
12 changes: 12 additions & 0 deletions images/linux/toolset-1804.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@
"3.7.*",
"3.8.*"
]
},
{
"name": "node",
"url" : "https://raw.githubusercontent.com/actions/node-versions/master/versions-manifest.json",
"platform" : "linux",
"arch": "x64",
"versions": [
"8.*",
"10.*",
"12.*",
"14.*"
]
}
]
}
12 changes: 6 additions & 6 deletions images/linux/ubuntu1604.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,12 +324,6 @@
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",
"scripts":[
"{{template_dir}}/scripts/installers/validate-disk-space.sh"
]
},
{
"type": "file",
"source": "{{user `metadata_file`}}",
Expand All @@ -345,6 +339,12 @@
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",
"scripts":[
"{{template_dir}}/scripts/installers/validate-disk-space.sh"
]
},
{
"type": "file",
"source": "{{template_dir}}/config/ubuntu1604.conf",
Expand Down
12 changes: 6 additions & 6 deletions images/linux/ubuntu1804.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,12 +328,6 @@
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",
"scripts":[
"{{template_dir}}/scripts/installers/validate-disk-space.sh"
]
},
{
"type": "file",
"source": "{{user `metadata_file`}}",
Expand All @@ -349,6 +343,12 @@
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{
"type": "shell",
"scripts":[
"{{template_dir}}/scripts/installers/validate-disk-space.sh"
]
},
{
"type": "file",
"source": "{{template_dir}}/config/ubuntu1804.conf",
Expand Down