Sort asar header, pass SOURCE_DATE_EPOCH to snap container

Author: hediet

build/azure-pipelines/linux/build-snap.sh

@@ -17,7 +17,9 @@ sudo apt-get install -y curl apt-transport-https ca-certificates
 SNAP_ROOT="$(pwd)/.build/linux/snap/$VSCODE_ARCH"
 
 # Create snap package
-BUILD_VERSION="$(git log -1 --pretty=%ct)"
+# SOURCE_DATE_EPOCH is provided by the outer pipeline (where git is available);
+# the snapcraft container does not include git.
+BUILD_VERSION="${SOURCE_DATE_EPOCH:-$(date +%s)}"
 SNAP_FILENAME="code-$VSCODE_QUALITY-$VSCODE_ARCH-$BUILD_VERSION.snap"
 SNAP_PATH="$SNAP_ROOT/$SNAP_FILENAME"
 case $VSCODE_ARCH in

build/azure-pipelines/linux/steps/product-build-linux-compile.yml

@@ -357,7 +357,8 @@ steps:
         - script: |
             set -e
             npm run gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
-            sudo -E docker run -e VSCODE_ARCH -e VSCODE_QUALITY -v $(pwd):/work -w /work vscodehub.azurecr.io/vscode-linux-build-agent:snapcraft-x64@sha256:ab4a88c4d85e0d7a85acabba59543f7143f575bab2c0b2b07f5b77d4a7e491ff /bin/bash -c "./build/azure-pipelines/linux/build-snap.sh"
+            export SOURCE_DATE_EPOCH="$(git log -1 --pretty=%ct)"
+            sudo -E docker run -e VSCODE_ARCH -e VSCODE_QUALITY -e SOURCE_DATE_EPOCH -v $(pwd):/work -w /work vscodehub.azurecr.io/vscode-linux-build-agent:snapcraft-x64@sha256:ab4a88c4d85e0d7a85acabba59543f7143f575bab2c0b2b07f5b77d4a7e491ff /bin/bash -c "./build/azure-pipelines/linux/build-snap.sh"
 
             SNAP_ROOT="$(pwd)/.build/linux/snap/$(VSCODE_ARCH)"
             SNAP_EXTRACTED_PATH=$(find $SNAP_ROOT -maxdepth 1 -type d -name 'code-*')

build/lib/asar.ts

@@ -129,7 +129,7 @@ export function createAsar(folderPath: string, unpackGlobs: string[], skipGlobs:
 		const finish = () => {
 			{
 				const headerPickle = pickle.createEmpty();
-				headerPickle.writeString(JSON.stringify(filesystem.header));
+				headerPickle.writeString(JSON.stringify(sortAsarHeader(filesystem.header)));
 				const headerBuf = headerPickle.toBuffer();
 
 				const sizePickle = pickle.createEmpty();
@@ -164,3 +164,22 @@ export function createAsar(folderPath: string, unpackGlobs: string[], skipGlobs:
 		}
 	});
 }
+
+// Recursively sorts directory entries in an asar filesystem header so that
+// serialization order does not depend on the order in which files arrived in
+// the input stream (which is filesystem-dependent via readdir).
+function sortAsarHeader<T>(node: T): T {
+	if (!node || typeof node !== 'object') {
+		return node;
+	}
+	const obj = node as Record<string, unknown>;
+	const files = obj['files'];
+	if (files && typeof files === 'object') {
+		const sorted: Record<string, unknown> = {};
+		for (const key of Object.keys(files as Record<string, unknown>).sort()) {
+			sorted[key] = sortAsarHeader((files as Record<string, unknown>)[key]);
+		}
+		obj['files'] = sorted;
+	}
+	return node;
+}