Merge pull request #4 from Automattic/add/buildkite

Add Buildkite

Author: jkmassel

.buildkite/pipeline.yml

@@ -0,0 +1,34 @@
+# Nodes with values to reuse in the pipeline.
+common_params:
+  plugins: &common_plugins
+  - &bash_cache automattic/bash-cache#v1.3.2: ~
+  # Common environment values to use with the `env` key.
+  env: &common_env
+    IMAGE_ID: xcode-12.5.1
+
+# This is the default pipeline – it will build and test the app
+steps:
+  #################
+  # Build and Test
+  #################
+  - label: "🧪 Build and Test"
+    key: "test"
+    command: |
+      echo "--- :swift: Building + Testing"
+      swift test
+    env: *common_env
+    plugins: *common_plugins
+
+  #################
+  # Publish the Binary (if we're building a tag)
+  #################
+  - label: "⬆️ Publish Binary"
+    key: "publish"
+    command: .buildkite/publish.sh
+    env: *common_env
+    plugins: *common_plugins
+    depends_on:
+      - "test"
+    if: build.tag != null
+    agents:
+      queue: "mac"

.buildkite/publish.sh

@@ -0,0 +1,26 @@
+#!/bin/bash -eu
+
+# Install the `gh` binary if needed
+if ! command -v gh &> /dev/null; then
+	brew install gh
+fi
+
+swift build -c release
+BUILDDIR=.build/artifacts/release
+mkdir -p $BUILDDIR
+
+cp .build/release/hostmgr $BUILDDIR/hostmgr
+cp Sources/hostmgr/resources/com.automattic.hostmgr.sync.plist $BUILDDIR/
+cp Sources/hostmgr/resources/com.automattic.hostmgr.git-mirror-sync.plist $BUILDDIR/
+cp Sources/hostmgr/resources/com.automattic.hostmgr.git-mirror-server.plist $BUILDDIR/
+
+tar -czf hostmgr.tar.gz -C $BUILDDIR .
+mv hostmgr.tar.gz .build/artifacts/hostmgr.tar.gz
+
+CHECKSUM=$(openssl sha256 .build/artifacts/hostmgr.tar.gz | awk '{print $2}')
+
+echo "Build complete: .build/artifacts/hostmgr.tar.gz"
+echo "  Checksum: $CHECKSUM"
+
+gh auth status
+gh release create $BUILDKITE_TAG --title $BUILDKITE_TAG --notes "Checksum: $CHECKSUM" .build/artifacts/hostmgr.tar.gz

Package.resolved

@@ -30,18 +30,51 @@ struct VMCloneCommand: ParsableCommand {
     )
     var wait: Bool = false
 
+    @Flag(
+        help: "Don't customize the VM's CPU and memory for the physical host – retain its existing settings"
+    )
+    var skipHostCustomization: Bool = false
+
+    @Option(
+        help: "Hypervisor Type"
+    )
+    var hypervisorType: StoppedVM.HypervisorType = .apple
+
+    @Option(
+        help: "Networking Type"
+    )
+    var networkingType: StoppedVM.NetworkType = .bridged
+
     func run() throws {
 
         let startDate = Date()
 
         try cloneVM(vm: source, wait: wait || start, startDate: startDate)
 
-        if start {
-            guard let newVM = try Parallels().lookupVM(named: destination)?.asStoppedVM() else {
-                print("Error finding cloned VM")
-                VMCloneCommand.exit()
-            }
+        guard let newVM = try Parallels().lookupVM(named: destination)?.asStoppedVM() else {
+            print("Error finding cloned VM")
+            VMCloneCommand.exit()
+        }
+
+        if !skipHostCustomization {
+
+            let totalSystemMemory = Int(ProcessInfo().physicalMemory / (1024 * 1024)) // In MB
+            let vmAvailableMemory = totalSystemMemory - 4096 // Always leave 4GB available to the VM host – the VM can have the rest
+
+            logger.debug("Total System Memory: \(totalSystemMemory) MB")
+            logger.debug("Allocating \(vmAvailableMemory) MB to VM")
+
+            let cpuCoreCount = ProcessInfo().physicalProcessorCount
+            logger.debug("Allocating \(cpuCoreCount) cores to VM")
 
+            try newVM.set(.cpuCount(cpuCoreCount))
+            try newVM.set(.memorySize(vmAvailableMemory))
+        }
+
+        try newVM.set(.hypervisorType(hypervisorType))
+        try newVM.set(.networkType(networkingType))
+
+        if start {
             try startVM(vm: newVM, wait: wait, startDate: startDate)
         }
     }
@@ -76,3 +109,6 @@ struct VMCloneCommand: ParsableCommand {
         print(String(format: "VM cloned and booted in %.2f seconds", Date().timeIntervalSince(startDate)))
     }
 }
+
+extension StoppedVM.NetworkType: ExpressibleByArgument {}
+extension StoppedVM.HypervisorType: ExpressibleByArgument {}

Sources/hostmgr/commands/vm/VMClone.swift

@@ -43,3 +43,26 @@ extension String {
         return NSString(string: self).expandingTildeInPath
     }
 }
+
+extension ProcessInfo {
+    var physicalProcessorCount: Int {
+        let output = Pipe()
+
+        do {
+            let task = Process()
+            task.launchPath = "/usr/sbin/sysctl"
+            task.arguments = ["-n", "hw.physicalcpu"]
+            task.standardOutput = output
+            try task.run()
+
+            let cpuCountData = output.fileHandleForReading.readDataToEndOfFile()
+            let cpuCountString = String(data: cpuCountData, encoding: .utf8)!.trimmingCharacters(in: .whitespacesAndNewlines)
+
+            return Int(cpuCountString) ?? self.processorCount
+        }
+        catch _ {
+            // Fall back to returning the count including SMT cores
+            return self.processorCount
+        }
+    }
+}