Fix 9: Allow OpenBSD to run on Linux

.github/workflows/ci.yml

@@ -64,13 +64,27 @@ jobs:
             uname:
               hardware: amd64
 
+          - name: OpenBSD
+            version: '6.8'
+            host: ubuntu-latest
+            workDirectory: /home/runner/work/action/action
+            uname:
+              hardware: amd64
+
           - name: OpenBSD
             version: '6.9'
             host: macos-10.15
             workDirectory: /Users/runner/work/action/action
             uname:
               hardware: amd64
 
+          - name: OpenBSD
+            version: '6.9'
+            host: ubuntu-latest
+            workDirectory: /home/runner/work/action/action
+            uname:
+              hardware: amd64
+
           - name: NetBSD
             version: '9.2'
             host: ubuntu-latest

changelog.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Add support for running OpenBSD on Linux ([#8](https://github.com/cross-platform-actions/action/issues/9))
 
 ## [0.4.0] - 2022-05-10
 ### Added

readme.md

@@ -113,7 +113,7 @@ they can run.
 
 | Runner            | OpenBSD | FreeBSD | NetBSD |
 | ----------------- | ------- | ------- | ------ |
-| **Linux**         | ✗       | ✓       | ✓      |
+| **Linux**         | ✓       | ✓       | ✓      |
 | **macos-10.15**   | ✓       | ✓       | ✗      |
 
 ## Under the Hood

src/architecture.ts

@@ -44,7 +44,7 @@ const architectures: ReadonlyMap<Kind, Architecture> = (() => {
     machineType: 'pc',
     accelerator:
       host.kind === host.Kind.darwin ? vm.Accelerator.hvf : vm.Accelerator.tcg,
-    resourceUrl: `${resourceBaseUrl}v0.4.0/qemu-system-x86_64-${hostString}.tar`
+    resourceUrl: `${resourceBaseUrl}v0.5.0/qemu-system-x86_64-${hostString}.tar`
   })
 
   return map

src/operating_system.ts

@@ -41,7 +41,7 @@ export abstract class OperatingSystem {
   readonly architecture: architecture.Architecture
 
   private static readonly resourceUrls = ResourceUrls.create()
-  protected readonly xhyveHypervisorUrl = `${OperatingSystem.resourceUrls.resourceBaseUrl}v0.3.1/xhyve-macos.tar`
+  protected readonly xhyveHypervisorUrl = `${OperatingSystem.resourceUrls.resourceBaseUrl}v0.5.0/xhyve-macos.tar`
 
   private readonly version: string
 
@@ -51,7 +51,7 @@ export abstract class OperatingSystem {
 
   constructor(name: string, arch: architecture.Architecture, version: string) {
     const hostString = host.toString(host.kind)
-    this.resourcesUrl = `${OperatingSystem.resourceUrls.resourceBaseUrl}v0.3.1/resources-${hostString}.tar`
+    this.resourcesUrl = `${OperatingSystem.resourceUrls.resourceBaseUrl}v0.5.0/resources-${hostString}.tar`
     this.name = name
     this.version = version
     this.architecture = arch
@@ -342,7 +342,7 @@ class OpenBsd extends OperatingSystem {
   }
 
   get virtualMachineImageReleaseVersion(): string {
-    return 'v0.2.0'
+    return 'v0.2.1'
   }
 
   createVirtualMachine(

src/qemu_vm.ts

@@ -27,11 +27,12 @@ export abstract class Vm extends vm.Vm {
       '-smp', `cpus=${this.configuration.cpuCount},sockets=${this.configuration.cpuCount}`,
       '-m', this.configuration.memory,
 
-      '-device', 'virtio-net,netdev=user.0',
+      '-device', `${this.netDevive},netdev=user.0`,
       '-netdev', `user,id=user.0,hostfwd=tcp::${this.configuration.ssHostPort}-:22`,
 
       '-display', 'none',
       '-monitor', 'none',
+      // '-nographic',
 
       '-boot', 'strict=off',
       /* eslint-disable @typescript-eslint/no-non-null-assertion */
@@ -54,6 +55,10 @@ export abstract class Vm extends vm.Vm {
       '-drive', `if=none,file=${this.configuration.resourcesDiskImage},id=drive1,cache=writeback,discard=ignore,format=raw`,
     ]
   }
+
+  protected get netDevive(): string {
+    return 'virtio-net'
+  }
 }
 
 export class FreeBsd extends Vm {
@@ -88,6 +93,10 @@ export class OpenBsd extends Vm {
     return this.defaultHardDriveFlags
   }
 
+  protected override get netDevive(): string {
+    return 'e1000'
+  }
+
   protected override async shutdown(): Promise<void> {
     await this.execute('sudo shutdown -h -p now')
   }