Make dev-tools, lab and the two build modules require the toolchain provisions instead of declaring the packages (issue 1573)

This commit is contained in:
2026-10-21 09:49:50 +00:00
parent 0f2cee1bea
commit 7753c27042
4 changed files with 11 additions and 43 deletions
+4 -15
View File
@@ -4,12 +4,11 @@
"capabilities": [
"package-manager"
],
"requires": [
"go-toolchain",
"node-toolchain"
],
"resources": [
{
"id": "go",
"type": "package",
"package": "go"
},
{
"id": "c-compiler",
"type": "package",
@@ -20,16 +19,6 @@
"type": "package",
"package": "make"
},
{
"id": "nodejs",
"type": "package",
"package": "nodejs"
},
{
"id": "npm",
"type": "package",
"package": "npm"
},
{
"id": "python",
"type": "package",
+3 -11
View File
@@ -6,7 +6,9 @@
"virtualisation"
],
"requires": [
"npm-package-registry"
"npm-package-registry",
"go-toolchain",
"node-toolchain"
],
"contributes": {
"npm-package-registry": {
@@ -84,16 +86,6 @@
"type": "package",
"package": "iproute2"
},
{
"id": "npm",
"type": "package",
"package": "npm"
},
{
"id": "go",
"type": "package",
"package": "go"
},
{
"id": "incus",
"type": "package",
+2 -6
View File
@@ -27,7 +27,8 @@
}
],
"requires": [
"forge-account"
"forge-account",
"go-toolchain"
],
"own-secrets": {
"broker": "${dir:state}/broker"
@@ -105,11 +106,6 @@
"mode": "0644",
"template": "files/gitconfig"
},
{
"id": "go",
"type": "package",
"package": "go"
},
{
"id": "git",
"type": "package",
+2 -11
View File
@@ -29,7 +29,8 @@
],
"requires": [
"forge-account",
"npm-package-registry"
"npm-package-registry",
"node-toolchain"
],
"contributes": {
"npm-package-registry": {
@@ -126,16 +127,6 @@
"artifact": "toolchain",
"unknown": "program"
},
{
"id": "nodejs",
"type": "package",
"package": "nodejs"
},
{
"id": "npm",
"type": "package",
"package": "npm"
},
{
"id": "git",
"type": "package",