perf(builder): speedup build time for macos_{arm64,amd64} (#57)

Author: ihexon

.github/workflows/build_macos-amd64.yaml

@@ -2,20 +2,20 @@ name: Build Intel MacOS Profile
 on:
   push:
     tags:
-      - 'v*'
+      - 'v**'
     branches:
       - 'main'
       - 'dev'
     paths-ignore:
-      - '*.md'
-      - '*.txt'
+      - '**.md'
+      - '**.txt'
   pull_request:
     branches:
       - 'main'
       - 'dev'
     paths-ignore:
-      - '*.md'
-      - '*.txt'
+      - '**.md'
+      - '**.txt'
 
 env:
   CI_ENV: IN_CI

.github/workflows/build_macos-arm64.yaml

@@ -2,20 +2,20 @@ name: Build ARM64 MacOS Profile
 on:
   push:
     tags:
-      - 'v*'
+      - 'v**'
     branches:
       - 'main'
       - 'dev'
     paths-ignore:
-      - '*.md'
-      - '*.txt'
+      - '**.md'
+      - '**.txt'
   pull_request:
     branches:
       - 'main'
       - 'dev'
     paths-ignore:
-      - '*.md'
-      - '*.txt'
+      - '**.md'
+      - '**.txt'
 
 env:
   CI_ENV: IN_CI

.github/workflows/build_wsl2-amd64.yaml

@@ -2,20 +2,20 @@ name: Build WSL2 Profile
 on:
   push:
     tags:
-      - 'v*'
+      - 'v**'
     branches:
       - 'main'
       - 'dev'
     paths-ignore:
-      - '*.md'
-      - '*.txt'
+      - '**.md'
+      - '**.txt'
   pull_request:
     branches:
       - 'main'
       - 'dev'
     paths-ignore:
-      - '*.md'
-      - '*.txt'
+      - '**.md'
+      - '**.txt'
 
 env:
   CI_ENV: IN_CI

README.md

@@ -1,4 +1,4 @@
-[![Build ARM64 MacOS Profile](https://github.com/ihexon/ovm-builder/actions/workflows/build_macos-arm64.yaml/badge.svg)](https://github.com/ihexon/ovm-builder/actions/workflows/build_macos-arm64.yaml) [![Build Intel MacOS Profile](https://github.com/ihexon/ovm-builder/actions/workflows/build_macos-amd64.yaml/badge.svg)](https://github.com/ihexon/ovm-builder/actions/workflows/build_macos-amd64.yaml) [![Build ARM64 MacOS Profile](https://github.com/ihexon/ovm-builder/actions/workflows/build_macos-arm64.yaml/badge.svg)](https://github.com/ihexon/ovm-builder/actions/workflows/build_macos-arm64.yaml)
+[![Build ARM64 MacOS Profile](https://github.com/ihexon/ovm-builder/actions/workflows/build_macos-arm64.yaml/badge.svg)](https://github.com/ihexon/ovm-builder/actions/workflows/build_macos-arm64.yaml) [![Build Intel MacOS Profile](https://github.com/ihexon/ovm-builder/actions/workflows/build_macos-amd64.yaml/badge.svg)](https://github.com/ihexon/ovm-builder/actions/workflows/build_macos-amd64.yaml) [![Build WSL2 Profile](https://github.com/ihexon/ovm-builder/actions/workflows/build_wsl2-amd64.yaml/badge.svg)](https://github.com/ihexon/ovm-builder/actions/workflows/build_wsl2-amd64.yaml) 
 # `make` commands
   - `macos_arm64` : make ovm bootable image for macos arm64
   - `wsl2_amd64`  : make ovm wsl2 rootfs distribute

make

@@ -62,6 +62,7 @@ parse_profile() {
 	if [[ "$SKIP_INSTALL_QEMU" == "true" ]]; then
 		echo "env SKIP_INSTALL_QEMU set true, skip install qemu"
 	else
+		echo "install qemu for cross building"
 		output="$output" workspace="$workspace" bash +x "${workspace}/subfunc/install_qemu.sh" || {
 			echo "Error: Install qemu failed"
 			exit 100

subfunc/build_proot.sh

@@ -17,8 +17,8 @@ git clone https://github.com/proot-me/proot "$proot_src" --depth 1
 
 cd "$proot_src"
 
-CFLAG="-Wno-error=implicit-function-declaration" make -C src loader.elf -j8
-CFLAG="-Wno-error=implicit-function-declaration" make -C src proot care -j8
+CFLAG="-Wno-error=implicit-function-declaration" make -C src loader.elf -j8 > /dev/null
+CFLAG="-Wno-error=implicit-function-declaration" make -C src proot care -j8 > /dev/null
 
 rm -rf /usr/bin/proot
 rm -rf /usr/local/bin/proot

target_builder/macos_amd64

@@ -29,12 +29,15 @@ echo "output: ${output:?}"
 bootable_url="https://github.com/oomol/builded/releases/download/v1.5/alpine_uefi_bootable-x86_64.img.zst"
 bootable_img_zst="$output/$(basename "$bootable_url")"
 bootable_img="${bootable_img_zst%.*}"
+sudo rm -rf "$bootable_img_zst" "$bootable_img"
+
 profile_name="$(basename "${target_profile:?}")"
 proot_args=()
-rootfs_dir="$output/rootfs_amd64"
+rootfs_dir="$output/rootfs"
 if [[ $BUILD_TYPE == cross ]]; then
 	proot_args+=("--qemu=$output/qemu_bins/static_qemu/bin/qemu-x86_64")
 fi
+
 proot_args+=("-r" "$rootfs_dir")
 proot_args+=("-b" "/dev:/dev")
 proot_args+=("-b" "/sys:/sys")
@@ -46,24 +49,36 @@ proot_args+=("-w" "/root")
 rootfs_part_uuid="4f1bfa20-73e8-4885-ab4b-1f9e67332f79"
 efi_part_uuid="F41A-23A6"
 
+run_cmd_in_rootfs() {
+	echo "Run cmd $*"
+	sudo -E proot "${proot_args[@]}" \
+		-0 /bin/su -c "$*"
+}
+
+mount_image() {
+	kpartx -av "$bootable_img"
+	mount -m -U "$rootfs_part_uuid" "$rootfs_dir"
+	mount -m -U "$efi_part_uuid" "$rootfs_dir/boot/efi"
+}
+
 bootstrap_alpine() {
 	echo "bootstrap alpine"
 	cd "$workspace"
-	sudo rm -rf "$bootable_img_zst" "$bootable_img"
 
 	mkdir -p "$output"
 	wget -c "$bootable_url" --output-document="${bootable_img_zst}" --output-file="$output/wget_alpine_image.log"
 
 	cd "$output"
 	zstd -d -f "${bootable_img_zst}"
 	# Mapping the part into /dev/mapper/loopNpN
-	kpartx -av "$bootable_img"
-	mount -m -U $rootfs_part_uuid "$rootfs_dir"
-	mount -m -U $efi_part_uuid "$rootfs_dir/boot/efi"
+	mount_image
 
 	# add community repo into alpine repositories
 	echo http://dl-cdn.alpinelinux.org/alpine/v3.20/community | tee -a "$rootfs_dir/etc/apk/repositories"
 
+	# change to mirror
+	sed -i 's#https\?://dl-cdn.alpinelinux.org/alpine#https://mirrors.tuna.tsinghua.edu.cn/alpine#g' "$rootfs_dir/etc/apk/repositories"
+
 	# Install required package into rootfs
 
 	echo "install pkgs into rootfs"
@@ -74,8 +89,6 @@ bootstrap_alpine() {
 	sudo -E proot "${proot_args[@]}" -0 /bin/su -c 'rm -rf /root/.ssh/ovm_id && \
 		ssh-keygen -f /root/.ssh/ovm_id -N "" && \
 		cat /root/.ssh/ovm_id.pub >> /root/.ssh/authorized_keys'
-
-	#tar -Jcvf "$output/macos_arm64_ssh.tar.xz" "$rootfs_dir/root/.ssh"
 	sync
 }
 
@@ -89,15 +102,6 @@ install_target_profile_deps() {
 	fi
 }
 
-clean_mapping() {
-	echo "clean disk mapping"
-	findmnt "$rootfs_dir" && {
-		umount -R "$rootfs_dir"
-	} || {
-		echo "$rootfs_dir not mount, no need to unmount"
-	}
-}
-
 copy_layer() {
 	cd "$workspace"
 	layer_dir="$workspace/layers/$profile_name"
@@ -106,9 +110,9 @@ copy_layer() {
 	# In MacOS the console device is hvc0
 	# In Qemu the console device is ttyAMA0
 	if [[ $VM_PROVIDER == "qemu" ]]; then
-		find ./ -type f -exec sed -i 's/VM_CONSOLE_DEVICE/ttyAMA0/g' {} + # Replace VM_CONSOLE_DEVICE to ttyAMA0
+		find "$layer_dir" -type f -exec sed -i 's/VM_CONSOLE_DEVICE/ttyAMA0/g' {} + # Replace VM_CONSOLE_DEVICE to ttyAMA0
 	else
-		find ./ -type f -exec sed -i 's/VM_CONSOLE_DEVICE/hvc0/g' {} + # Replace VM_CONSOLE_DEVICE to hvc0
+		find "$layer_dir" -type f -exec sed -i 's/VM_CONSOLE_DEVICE/hvc0/g' {} + # Replace VM_CONSOLE_DEVICE to hvc0
 	fi
 
 	echo "copy $layer_dir layers files"
@@ -124,33 +128,24 @@ copy_layer() {
 		-0 /bin/su -c "echo rc_parallel=YES >> /etc/rc.conf"
 
 	sudo -E proot "${proot_args[@]}" \
-		-0 /bin/su -c "touch /.first_boot"
+		-0 /bin/su -c "echo first_boot > /.first_boot"
 
-	sync # must do sync !
-}
-
-umount_rootfs() {
-	echo "umount rootfs"
-	umount -R "$rootfs_dir"
+	sync
 }
 
 pack_rootfs() {
 	echo "pack rootfs"
+	losetup -a
 	cd "$output"
-	zstd --stdout --force "$bootable_img" > "$bootable_img_zst"
+	zstd --stdout --force "$bootable_img" >"$bootable_img_zst"
 	sha256sum "$bootable_img_zst" | tee "$bootable_img_zst.sha256sum"
 	cd "$workspace"
 }
 
 echo "=== $profile_name ==="
-
-clean_mapping
 install_target_profile_deps
 
 bootstrap_alpine
 copy_layer
-umount_rootfs
-clean_mapping
 
-# Final stage: boot raw disk and do update-grub
 pack_rootfs

target_builder/macos_arm64

@@ -29,12 +29,15 @@ echo "output: ${output:?}"
 bootable_url="https://github.com/oomol/builded/releases/download/v1.1/alpine_uefi_bootable-arm64.img.zst"
 bootable_img_zst="$output/$(basename "$bootable_url")"
 bootable_img="${bootable_img_zst%.*}"
+sudo rm -rf "$bootable_img_zst" "$bootable_img"
+
 profile_name="$(basename "${target_profile:?}")"
 proot_args=()
-rootfs_dir="$output/rootfs_arm64"
+rootfs_dir="$output/rootfs"
 if [[ $BUILD_TYPE == cross ]]; then
 	proot_args+=("--qemu=$output/qemu_bins/static_qemu/bin/qemu-aarch64")
 fi
+
 proot_args+=("-r" "$rootfs_dir")
 proot_args+=("-b" "/dev:/dev")
 proot_args+=("-b" "/sys:/sys")
@@ -46,24 +49,36 @@ proot_args+=("-w" "/root")
 rootfs_part_uuid="d1e46927-eb5d-4fbf-986a-7e5581f37a16"
 efi_part_uuid="6729-82AB"
 
+run_cmd_in_rootfs() {
+	echo "Run cmd $*"
+	sudo -E proot "${proot_args[@]}" \
+		-0 /bin/su -c "$*"
+}
+
+mount_image() {
+	kpartx -av "$bootable_img"
+	mount -m -U "$rootfs_part_uuid" "$rootfs_dir"
+	mount -m -U "$efi_part_uuid" "$rootfs_dir/boot/efi"
+}
+
 bootstrap_alpine() {
 	echo "bootstrap alpine"
 	cd "$workspace"
-	sudo rm -rf "$bootable_img_zst" "$bootable_img"
 
 	mkdir -p "$output"
 	wget -c "$bootable_url" --output-document="${bootable_img_zst}" --output-file="$output/wget_alpine_image.log"
 
 	cd "$output"
 	zstd -d -f "${bootable_img_zst}"
 	# Mapping the part into /dev/mapper/loopNpN
-	kpartx -av "$bootable_img"
-	mount -m -U $rootfs_part_uuid "$rootfs_dir"
-	mount -m -U $efi_part_uuid "$rootfs_dir/boot/efi"
+	mount_image
 
 	# add community repo into alpine repositories
 	echo http://dl-cdn.alpinelinux.org/alpine/v3.20/community | tee -a "$rootfs_dir/etc/apk/repositories"
 
+	# change to mirror
+	sed -i 's#https\?://dl-cdn.alpinelinux.org/alpine#https://mirrors.tuna.tsinghua.edu.cn/alpine#g' "$rootfs_dir/etc/apk/repositories"
+
 	# Install required package into rootfs
 
 	echo "install pkgs into rootfs"
@@ -74,8 +89,6 @@ bootstrap_alpine() {
 	sudo -E proot "${proot_args[@]}" -0 /bin/su -c 'rm -rf /root/.ssh/ovm_id && \
 		ssh-keygen -f /root/.ssh/ovm_id -N "" && \
 		cat /root/.ssh/ovm_id.pub >> /root/.ssh/authorized_keys'
-
-	#tar -Jcvf "$output/macos_arm64_ssh.tar.xz" "$rootfs_dir/root/.ssh"
 	sync
 }
 
@@ -89,15 +102,6 @@ install_target_profile_deps() {
 	fi
 }
 
-clean_mapping() {
-	echo "clean disk mapping"
-	findmnt "$rootfs_dir" && {
-		umount -R "$rootfs_dir"
-	} || {
-		echo "$rootfs_dir not mount, no need to unmount"
-	}
-}
-
 copy_layer() {
 	cd "$workspace"
 	layer_dir="$workspace/layers/$profile_name"
@@ -106,9 +110,9 @@ copy_layer() {
 	# In MacOS the console device is hvc0
 	# In Qemu the console device is ttyAMA0
 	if [[ $VM_PROVIDER == "qemu" ]]; then
-		find ./ -type f -exec sed -i 's/VM_CONSOLE_DEVICE/ttyAMA0/g' {} + # Replace VM_CONSOLE_DEVICE to ttyAMA0
+		find "$layer_dir" -type f -exec sed -i 's/VM_CONSOLE_DEVICE/ttyAMA0/g' {} + # Replace VM_CONSOLE_DEVICE to ttyAMA0
 	else
-		find ./ -type f -exec sed -i 's/VM_CONSOLE_DEVICE/hvc0/g' {} + # Replace VM_CONSOLE_DEVICE to hvc0
+		find "$layer_dir" -type f -exec sed -i 's/VM_CONSOLE_DEVICE/hvc0/g' {} + # Replace VM_CONSOLE_DEVICE to hvc0
 	fi
 
 	echo "copy $layer_dir layers files"
@@ -124,33 +128,24 @@ copy_layer() {
 		-0 /bin/su -c "echo rc_parallel=YES >> /etc/rc.conf"
 
 	sudo -E proot "${proot_args[@]}" \
-		-0 /bin/su -c "touch /.first_boot"
+		-0 /bin/su -c "echo first_boot > /.first_boot"
 
-	sync # must do sync !
-}
-
-umount_rootfs() {
-	echo "umount rootfs"
-	umount -R "$rootfs_dir"
+	sync
 }
 
 pack_rootfs() {
 	echo "pack rootfs"
+	losetup -a
 	cd "$output"
-	zstd --stdout --force "$bootable_img" > "$bootable_img_zst"
+	zstd --stdout --force "$bootable_img" >"$bootable_img_zst"
 	sha256sum "$bootable_img_zst" | tee "$bootable_img_zst.sha256sum"
 	cd "$workspace"
 }
 
 echo "=== $profile_name ==="
-
-clean_mapping
 install_target_profile_deps
 
 bootstrap_alpine
 copy_layer
-umount_rootfs
-clean_mapping
 
-# Final stage: boot raw disk and do update-grub
 pack_rootfs