Add support for FreeBSD ARM64

.github/workflows/ci.yml

@@ -110,6 +110,46 @@ jobs:
               hardware: amd64
               release: 13.2-RELEASE
 
+          - name: FreeBSD
+            architecture: ARM64
+            version: '12.4'
+            host: ubuntu-latest
+            # /home is symlinked to /usr/home. pwd will return the resolved path.
+            workDirectory: /usr/home/runner/work/action/action
+            uname:
+              hardware: arm64
+              release: 12.4-RELEASE
+
+          - name: FreeBSD
+            architecture: ARM64
+            version: '13.0'
+            host: ubuntu-latest
+            # /home is symlinked to /usr/home. pwd will return the resolved path.
+            workDirectory: /usr/home/runner/work/action/action
+            uname:
+              hardware: arm64
+              release: 13.0-RELEASE
+
+          - name: FreeBSD
+            architecture: ARM64
+            version: '13.1'
+            host: ubuntu-latest
+            # /home is symlinked to /usr/home. pwd will return the resolved path.
+            workDirectory: /usr/home/runner/work/action/action
+            uname:
+              hardware: arm64
+              release: 13.1-RELEASE
+
+          - name: FreeBSD
+            architecture: ARM64
+            version: '13.2'
+            host: ubuntu-latest
+            # /home is symlinked to /usr/home. pwd will return the resolved path.
+            workDirectory: /usr/home/runner/work/action/action
+            uname:
+              hardware: arm64
+              release: 13.2-RELEASE
+
           - name: OpenBSD
             version: '6.8'
             host: macos-12

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 FreeBSD ARM64 ([#55](https://github.com/cross-platform-actions/action/issues/55))
 
 ## [0.15.0] - 2023-06-12
 ### Changed

readme.md

@@ -153,13 +153,13 @@ operating system will list which versions are supported.
 
 ### [FreeBSD][freebsd_builder] (`freebsd`)
 
-| Version | x86-64 |
-| ------- | ------ |
-| 13.2    | ✅     |
-| 13.1    | ✅     |
-| 13.0    | ✅     |
-| 12.4    | ✅     |
-| 12.2    | ✅     |
+| Version | x86-64 | arm64  |
+| ------- | ------ | ------ |
+| 13.2    | ✅     | ✅     |
+| 13.1    | ✅     | ✅     |
+| 13.0    | ✅     | ✅     |
+| 12.4    | ✅     | ✅     |
+| 12.2    | ✅     | ❌     |
 
 ### [NetBSD][netbsd_builder] (`netbsd`)
 

src/architecture.ts

@@ -14,8 +14,9 @@ export enum Kind {
 
 export abstract class Architecture {
   readonly kind: Kind
+  readonly host: Host
+
   protected readonly resourceBaseUrl = ResourceUrls.create().resourceBaseUrl
-  protected readonly host: Host
 
   constructor(kind: Kind, host: Host) {
     this.kind = kind
@@ -62,7 +63,7 @@ export abstract class Architecture {
     return this.host.qemu
   }
 
-  private static readonly Arm64 = class extends Architecture {
+  static readonly Arm64 = class extends Architecture {
     override get name(): string {
       return 'arm64'
     }

src/operating_systems/freebsd/arm64.ts

@@ -0,0 +1,8 @@
+import {Architecture} from '../../architecture'
+import {Hypervisor} from '../../hypervisor'
+
+export default class Arm64 extends Architecture.Arm64 {
+  override get hypervisor(): Hypervisor {
+    return this.host.efiHypervisor
+  }
+}

src/operating_systems/freebsd/factory.ts

@@ -1,3 +1,5 @@
+import * as architecture from '../../architecture'
+import Arm64 from './arm64'
 import {Hypervisor, Kind as HypervisorKind} from '../../hypervisor'
 import {OperatingSystem} from '../../operating_system'
 import {factory, Factory as BaseFactory} from '../factory'
@@ -11,10 +13,18 @@ class FreeBsdFactory extends BaseFactory {
   }
 
   override create(version: string, hypervisor: Hypervisor): OperatingSystem {
-    return new FreeBsd(this.architecture, version, hypervisor)
+    return new FreeBsd(this.resolveArchitecture(), version, hypervisor)
   }
 
   override validateHypervisor(kind: HypervisorKind): void {
     this.architecture.validateHypervisor(kind)
   }
+
+  private resolveArchitecture(): architecture.Architecture {
+    if (this.architecture.kind == architecture.Kind.arm64) {
+      return new Arm64(this.architecture.kind, this.architecture.host)
+    }
+
+    return this.architecture
+  }
 }

src/operating_systems/freebsd/freebsd.ts

@@ -33,10 +33,12 @@ export default class FreeBsd extends os.OperatingSystem {
   }
 
   get actionImplementationKind(): action.ImplementationKind {
-    return this.architecture.resolve({
-      x86_64: action.ImplementationKind.xhyve,
-      default: action.ImplementationKind.qemu
-    })
+    if (this.architecture.kind === architecture.Kind.x86_64) {
+      return this.architecture.resolve({
+        x86_64: action.ImplementationKind.xhyve,
+        default: action.ImplementationKind.qemu
+      })
+    } else return action.ImplementationKind.qemu
   }
 
   override async prepareDisk(
@@ -67,19 +69,13 @@ export default class FreeBsd extends os.OperatingSystem {
   ): vmModule.Vm {
     core.debug('Creating FreeBSD VM')
 
-    if (this.architecture.kind !== architecture.Kind.x86_64) {
-      throw Error(
-        `Not implemented: FreeBSD guests are not implemented on ${this.architecture.name}`
-      )
-    }
-
     const config: vmModule.Configuration = {
       ...configuration,
 
       ssHostPort: this.ssHostPort,
       firmware: path.join(
         firmwareDirectory.toString(),
-        this.hypervisor.firmwareFile
+        this.architecture.hypervisor.firmwareFile
       ),
 
       // qemu

src/version.ts

@@ -1,6 +1,6 @@
 const version = {
   operating_system: {
-    freebsd: 'v0.4.0',
+    freebsd: 'v0.5.0',
     netbsd: 'v0.2.0',
     openbsd: 'v0.6.0'
   },