fixup! Add support for NetBSD ARM64

.github/workflows/ci.yml

@@ -124,20 +124,34 @@ jobs:
       fail-fast: false
       matrix:
         version:
+          - '10.0_RC2'
           - '9.3'
           - '9.2'
 
         architecture:
           - name: x86-64
             uname: amd64
 
+          - name: arm64
+            uname: aarch64
+
         host:
           - name: ubuntu-latest
             work_directory: /home/runner/work/action/action
 
           - name: macos-latest
             work_directory: /Users/runner/work/action/action
 
+        exclude:
+          - version: '9.3'
+            architecture: { name: arm64 }
+
+          - version: '9.2'
+            architecture: { name: arm64 }
+
+          - architecture: { name: arm64 }
+            host: { name: macos-latest }
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/support/test/action.yml

@@ -34,12 +34,14 @@ runs:
           shutdown_vm: false
           run: |
             uname -a
+            uname -m
+            uname -p
             echo $SHELL
             pwd
             ls -lah
             whoami
             env | sort
             [ "`uname -s`" = '${{ inputs.name }}' ]
             [ "`uname -r`" = '${{ inputs.uname_release || inputs.version }}' ]
-            [ "`uname -m`" = '${{ inputs.uname_hardware }}' ]
+            [ "`uname -m`" = '${{ inputs.uname_hardware }}' ] || [ "`uname -p`" = '${{ inputs.uname_hardware }}' ]
             [ "`pwd`" = '${{ inputs.work_directory }}' ]

src/architecture.ts

@@ -105,7 +105,7 @@ export abstract class Architecture {
     }
 
     override get hypervisor(): hypervisor.Hypervisor {
-      return new hypervisor.Qemu()
+      return this.host.efiHypervisor
     }
 
     override get efiHypervisor(): hypervisor.Hypervisor {

src/operating_systems/freebsd/factory.ts

@@ -1,35 +1,11 @@
-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'
 import FreeBsd from './freebsd'
 
 @factory
 //@ts-ignore
 class FreeBsdFactory extends BaseFactory {
-  override createImpl(
-    version: string,
-    hypervisor: Hypervisor
-  ): OperatingSystem {
-    return new FreeBsd(this.resolveArchitecture(hypervisor), version)
-  }
-
-  override validateHypervisor(kind: HypervisorKind): void {
-    this.architecture.validateHypervisor(kind)
-  }
-
-  private resolveArchitecture(
-    hypervisor: Hypervisor
-  ): architecture.Architecture {
-    if (this.architecture.kind == architecture.Kind.arm64) {
-      return new Arm64(
-        this.architecture.kind,
-        this.architecture.host,
-        hypervisor
-      )
-    }
-
-    return this.architecture
+  override createImpl(version: string): OperatingSystem {
+    return new FreeBsd(this.architecture, version)
   }
 }