vscdc tooling - Fix bug: Add new parent-child relation (devcontainers#299)

Author: samruddhikhandale

.github/workflows/push-dev.yml

@@ -11,8 +11,8 @@ jobs:
     if: "github.ref == 'refs/heads/main'"
     strategy:
       matrix:
-        page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60]
-        page-total: [60]
+        page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53]
+        page-total: [53]
       fail-fast: false
     runs-on: devcontainer-image-builder-ubuntu
     steps:

.github/workflows/push.yml

@@ -11,8 +11,8 @@ jobs:
     if: ${{ github.event.base_ref == 'refs/heads/main' }}
     strategy:
       matrix:
-        page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60]
-        page-total: [60]
+        page: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53]
+        page-total: [53]
       fail-fast: false
     runs-on: devcontainer-image-builder-ubuntu
     steps:

.vscode/launch.json

@@ -0,0 +1,27 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "vscdc/build push",
+            "program": "${workspaceFolder}/build/vscdc",
+            "cwd": "${workspaceFolder}",
+            "args": [
+                "push",
+                "--no-push",
+                "--registry",
+                "mcr.microsoft.com",
+                "--registry-path",
+                "devcontainers",
+                "--release",
+                "v1.1.0",
+                "--page",
+                "1",
+                "--pageTotal",
+                "53"
+            ],
+            "console": "integratedTerminal",
+        }
+    ]
+}

build/src/utils/config.js

@@ -17,6 +17,8 @@ config.definitionVariants = config.definitionVariants || {};
 const stagingFolders = {};
 const definitionTagLookup = {};
 const allDefinitionPaths = {};
+let variantsList = [];
+let skipParentVariants = [];
 
 // Must be called first
 async function loadConfig(repoPath) {
@@ -355,8 +357,6 @@ function getSortedDefinitionBuildList(page, pageTotal, definitionsToSkip) {
         }
     }
 
-    let variantsList = [];
-    let skipParentVariants = [];
 
     // Configure and club dependent variants together.
     for (let id in parentBuckets) {
@@ -380,16 +380,11 @@ function getSortedDefinitionBuildList(page, pageTotal, definitionsToSkip) {
                     let parentVariants = config.definitionVariants[parentId];
                     if (variants) {
                         variants.forEach(variant => {
-                            if (parentVariants.includes(variant)) {
-                                const parentItem = getDefinitionObject(parentId, variant);
-                                const item = [
-                                    parentItem,
-                                    getDefinitionObject(definitionId, variant)
-                                ]
-
-                                variantsList.push(item);
-                                skipParentVariants.push(parentItem);
-
+                            const variantId = config.definitionBuildSettings[definitionId].idMismatch === "true" && variant.includes('-') ? variant.split('-')[1] : variant;
+                            if (parentVariants.includes(variantId)) {
+                                const parentItem = getDefinitionObject(parentId, variantId);
+                                const childItem = getDefinitionObject(definitionId, variant);
+                                addToVariantsList(parentItem, childItem);
                             } else {
                                 variantsList.push([getDefinitionObject(definitionId, variant)]);
                             }
@@ -415,15 +410,8 @@ function getSortedDefinitionBuildList(page, pageTotal, definitionsToSkip) {
                             const shouldAddSingleVariant = parentId[commonVariant];
                             if (parentVariants.includes(commonVariant)) {
                                 const parentItem = getDefinitionObject(parentObjId, commonVariant);
-
-                                const item = [
-                                    parentItem,
-                                    getDefinitionObject(definitionId, commonVariant)
-                                ]
-
-                                variantsList.push(item);
-                                skipParentVariants.push(parentItem);
-
+                                const childItem = getDefinitionObject(definitionId, commonVariant);
+                                addToVariantsList(parentItem, childItem);
                             } else if (shouldAddSingleVariant) {
                                 variantsList.push([getDefinitionObject(definitionId, commonVariant)]);
                             }
@@ -483,6 +471,35 @@ function getSortedDefinitionBuildList(page, pageTotal, definitionsToSkip) {
     return allPages[page - 1];
 }
 
+function addToVariantsList(parentItem, childItem) {
+    let isAdded = false;
+    for (let x = 0; x < variantsList.length; x++) {
+        for (let y = 0; y < variantsList[x].length; y++) {
+            const variantItem = variantsList[x][y];
+            if (variantItem.id === parentItem.id && variantItem.variant === parentItem.variant) {
+                variantsList[x].push(childItem);
+                isAdded = true;
+                break;
+            }
+        }
+
+        if (isAdded) {
+            break;
+        }
+    }
+
+    if (!isAdded) {
+        const item = [
+            parentItem,
+            childItem
+        ]
+
+        variantsList.push(item);
+    }
+
+    skipParentVariants.push(parentItem);
+}
+
 function getDefinitionList() {
     let definitionList = [];
     for (let definitionId in config.definitionBuildSettings) {

src/java-8/manifest.json

@@ -7,6 +7,8 @@
 	"build": {
 		"latest": false,
 		"rootDistro": "debian",
+		"parent": "base-debian",
+		"idMismatch": "true",
 		"architectures": {
 			"bullseye": [
 				"linux/amd64",

src/java/manifest.json

@@ -9,6 +9,8 @@
 	"build": {
 		"latest": "17-bullseye",
 		"rootDistro": "debian",
+		"parent": "base-debian",
+		"idMismatch": "true",
 		"variantBuildArgs": {
 			"17-bullseye": {
 				"TARGET_JAVA_VERSION": "17",