build

build/tfs/linux/product-build-linux.yml

@@ -94,9 +94,11 @@ steps:
 
     # Publish Snap
     npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
-    # SNAPCRAFT_MACAROON="$(SNAPCRAFT_MACAROON)" \
-    # SNAPCRAFT_UNBOUND_DISCHARGE="$(SNAPCRAFT_UNBOUND_DISCHARGE)" \
-    # ./build/tfs/linux/release-snap.sh
+
+    # Pack snap tarball artifact, in order to preserve file perms
+    SNAP_TARBALL_PATH="$REPO/.build/linux/snap-$(VSCODE_ARCH).tar.gz"
+    rm -rf $SNAP_TARBALL_PATH
+    (cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
   displayName: 'Component Detection'
@@ -105,4 +107,4 @@ steps:
   displayName: 'Publish Pipeline Artifact'
   inputs:
     artifactName: snap-$(VSCODE_ARCH)
-    targetPath: .build/linux/snap
+    targetPath: .build/linux/snap-$(VSCODE_ARCH).tar.gz

build/tfs/linux/snap-build-linux.yml

@@ -11,7 +11,7 @@ steps:
   displayName: 'Download Pipeline Artifact'
   inputs:
     artifactName: snap-$(VSCODE_ARCH)
-    targetPath: .build/linux/snap
+    targetPath: .build/linux/snap-$(VSCODE_ARCH).tar.gz
 
 - script: |
     set -e
@@ -22,6 +22,10 @@ steps:
     ARCH="$(VSCODE_ARCH)"
     SNAP_ROOT="$REPO/.build/linux/snap/$ARCH"
 
+    # Unpack snap tarball artifact, in order to preserve file perms
+    SNAP_TARBALL_PATH="$REPO/.build/linux/snap-$ARCH.tar.gz"
+    (cd .build/linux && tar -xzf $SNAP_TARBALL_PATH)
+
     ls -la "$SNAP_ROOT"
 
     BUILD_VERSION="$(date +%s)"
@@ -30,9 +34,7 @@ steps:
     VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
     SNAP_PATH="$SNAP_ROOT/$SNAP_FILENAME"
 
-    (cd $SNAP_ROOT/code-* && \
-        chmod 755 electron-launch usr/share/code*/snapUpdate.sh && \
-        snapcraft snap --output "$SNAP_PATH")
+    (cd $SNAP_ROOT/code-* && snapcraft snap --output "$SNAP_PATH")
 
     AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
     AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \