Merge pull request #435 from tgenov/main

feat: native multi-platform builds via runner matrix (no QEMU emulation)

Author: abdurriq

.github/workflows/ci_common.yml

@@ -292,6 +292,7 @@ jobs:
         run: |
           (cd common && npm install && npm run build)
           (cd github-action/ && npm install && npm run build && npm run package)
+          (cd merge/ && npm install && npm run build && npm run package)
 
       # - name: Publish AzDO Task
       #   uses: ./

action.yml

@@ -66,6 +66,10 @@ inputs:
   cacheTo:
     required: false
     description: Specify the image to cache the built image to
+  useNativeRunner:
+    required: false
+    default: 'false'
+    description: 'Set to true for native multi-platform builds. When true, platform must be a single value (e.g., linux/amd64) and the image tag suffix is auto-derived (linux/amd64 becomes linux-amd64). The --platform flag is not passed to devcontainer build, relying on the native runner architecture.'
 outputs:
   runCmdOutput:
     description: The output of the command specified in the runCmd input

azdo-task/DevcontainersCi/src/main.ts

@@ -12,10 +12,18 @@ import {
 import {isDockerBuildXInstalled, pushImage} from './docker';
 import {isSkopeoInstalled, copyImage} from './skopeo';
 import {exec} from './exec';
+import {
+	buildImageNames,
+	platformToTagSuffix,
+} from '../../../common/src/platform';
 
 export async function runMain(): Promise<void> {
 	try {
 		task.setTaskVariable('hasRunMain', 'true');
+
+		const useNativeRunner =
+			(task.getInput('useNativeRunner') ?? 'false') === 'true';
+
 		const buildXInstalled = await isDockerBuildXInstalled();
 		if (!buildXInstalled) {
 			console.log(
@@ -52,7 +60,31 @@ export async function runMain(): Promise<void> {
 		const skipContainerUserIdUpdate =
 			(task.getInput('skipContainerUserIdUpdate') ?? 'false') === 'true';
 
-		if (platform) {
+		if (useNativeRunner) {
+			if (!platform) {
+				task.setResult(
+					task.TaskResult.Failed,
+					'platform is required when useNativeRunner is true',
+				);
+				return;
+			}
+			if (platform.includes(',')) {
+				task.setResult(
+					task.TaskResult.Failed,
+					`useNativeRunner requires a single platform value, got '${platform}'`,
+				);
+				return;
+			}
+		}
+
+		let platformSuffix: string | undefined;
+		if (useNativeRunner) {
+			platformSuffix = platformToTagSuffix(platform!);
+			task.setTaskVariable('useNativeRunner', 'true');
+			task.setTaskVariable('platformSuffix', platformSuffix);
+		}
+
+		if (platform && !useNativeRunner) {
 			const skopeoInstalled = await isSkopeoInstalled();
 			if (!skopeoInstalled) {
 				console.log(
@@ -61,7 +93,10 @@ export async function runMain(): Promise<void> {
 				return;
 			}
 		}
-		const buildxOutput = platform ? 'type=oci,dest=/tmp/output.tar' : undefined;
+		let buildxOutput: string | undefined;
+		if (platform && !useNativeRunner) {
+			buildxOutput = 'type=oci,dest=/tmp/output.tar';
+		}
 
 		const log = (message: string): void => console.log(message);
 		const workspaceFolder = path.resolve(checkoutPath, subFolder);
@@ -70,10 +105,9 @@ export async function runMain(): Promise<void> {
 
 		const resolvedImageTag = imageTag ?? 'latest';
 		const imageTagArray = resolvedImageTag.split(/\s*,\s*/);
-		const fullImageNameArray: string[] = [];
-		for (const tag of imageTagArray) {
-			fullImageNameArray.push(`${imageName}:${tag}`);
-		}
+		const fullImageNameArray = imageName
+			? buildImageNames(imageName, imageTagArray, platformSuffix)
+			: [];
 		if (imageName) {
 			if (fullImageNameArray.length === 1) {
 				if (!noCache && !cacheFrom.includes(fullImageNameArray[0])) {
@@ -98,9 +132,9 @@ export async function runMain(): Promise<void> {
 			workspaceFolder,
 			configFile,
 			imageName: fullImageNameArray,
-			platform,
+			platform: useNativeRunner ? undefined : platform,
 			additionalCacheFroms: cacheFrom,
-			output: buildxOutput,
+			output: useNativeRunner ? undefined : buildxOutput,
 			noCache,
 			cacheTo,
 		};
@@ -192,6 +226,9 @@ export async function runPost(): Promise<void> {
 	const pushOnFailedBuild =
 		(task.getInput('pushOnFailedBuild') ?? 'false') === 'true';
 
+	const useNativeRunner = task.getTaskVariable('useNativeRunner') === 'true';
+	const platformSuffix = task.getTaskVariable('platformSuffix');
+
 	// default to 'never' if not set and no imageName
 	if (pushOption === 'never' || (!pushOption && !imageName)) {
 		console.log(`Image push skipped because 'push' is set to '${pushOption}'`);
@@ -259,8 +296,16 @@ export async function runPost(): Promise<void> {
 	}
 	const imageTag = task.getInput('imageTag') ?? 'latest';
 	const imageTagArray = imageTag.split(/\s*,\s*/);
+
 	const platform = task.getInput('platform');
-	if (platform) {
+	if (useNativeRunner && platformSuffix) {
+		for (const tag of imageTagArray) {
+			console.log(
+				`Pushing platform image '${imageName}:${tag}-${platformSuffix}'...`,
+			);
+			await pushImage(imageName, `${tag}-${platformSuffix}`);
+		}
+	} else if (platform) {
 		for (const tag of imageTagArray) {
 			console.log(`Copying multiplatform image '${imageName}:${tag}'...`);
 			const imageSource = `oci-archive:/tmp/output.tar:${tag}`;

azdo-task/DevcontainersCi/task.json

@@ -128,6 +128,13 @@
       "type": "multiLine",
       "label": "Specify the image to cache the built image to",
       "required": false
+    },
+    {
+      "name": "useNativeRunner",
+      "type": "boolean",
+      "label": "Set to true for native multi-platform builds. When true, platform must be a single value and the image tag suffix is auto-derived.",
+      "required": false,
+      "defaultValue": false
     }
   ],
   "outputVariables": [{

azdo-task/DevcontainersMerge/.eslintignore

@@ -0,0 +1,4 @@
+dist/
+lib/
+node_modules/
+jest.config.js

azdo-task/DevcontainersMerge/.eslintrc.json

@@ -0,0 +1,54 @@
+{
+    "plugins": ["jest", "@typescript-eslint"],
+    "extends": ["plugin:github/recommended"],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+      "ecmaVersion": 9,
+      "sourceType": "module",
+      "project": "./tsconfig.json"
+    },
+    "rules": {
+      "eslint-comments/no-use": "off",
+      "import/no-namespace": "off",
+      "i18n-text/no-en": "off",
+      "no-unused-vars": "off",
+      "@typescript-eslint/no-unused-vars": "error",
+      "@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
+      "@typescript-eslint/no-require-imports": "error",
+      "@typescript-eslint/array-type": "error",
+      "@typescript-eslint/await-thenable": "error",
+      "@typescript-eslint/ban-ts-comment": "error",
+      "camelcase": "off",
+      "@typescript-eslint/consistent-type-assertions": "error",
+      "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
+      "func-call-spacing": ["error", "never"],
+      "@typescript-eslint/no-array-constructor": "error",
+      "@typescript-eslint/no-empty-interface": "error",
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/no-extraneous-class": "error",
+      "@typescript-eslint/no-for-in-array": "error",
+      "@typescript-eslint/no-inferrable-types": "error",
+      "@typescript-eslint/no-misused-new": "error",
+      "@typescript-eslint/no-namespace": "error",
+      "@typescript-eslint/no-non-null-assertion": "warn",
+      "@typescript-eslint/no-unnecessary-qualifier": "error",
+      "@typescript-eslint/no-unnecessary-type-assertion": "error",
+      "@typescript-eslint/no-useless-constructor": "error",
+      "@typescript-eslint/no-var-requires": "error",
+      "@typescript-eslint/prefer-for-of": "warn",
+      "@typescript-eslint/prefer-function-type": "warn",
+      "@typescript-eslint/prefer-includes": "error",
+      "@typescript-eslint/prefer-string-starts-ends-with": "error",
+      "@typescript-eslint/promise-function-async": "error",
+      "@typescript-eslint/require-array-sort-compare": "error",
+      "@typescript-eslint/restrict-plus-operands": "error",
+      "semi": ["error", "always"],
+      "@typescript-eslint/unbound-method": "error",
+      "no-console": "off"
+    },
+    "env": {
+      "node": true,
+      "es6": true,
+      "jest/globals": true
+    }
+  }

azdo-task/DevcontainersMerge/.prettierignore

@@ -0,0 +1,3 @@
+dist/
+lib/
+node_modules/

azdo-task/DevcontainersMerge/.prettierrc.json

@@ -0,0 +1,10 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": true,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": false,
+  "arrowParens": "avoid"
+}