Enable tests for Windows x86 and ARM64 architectures

- Win32 (x86): register driver under WOW6432Node for 32-bit ODBC Driver
  Manager; use PSFirebird win-x86 RID for x86 Firebird binaries
- Windows ARM64: test on windows-11-arm with x64 build + x64 Firebird
  via emulation (no ARM64 Firebird Windows binaries exist yet);
  keep cross-compile on windows-latest for ARM64 release artifact
- Add FirebirdRid mapping: Win32->win-x86, ARM64->win-x64 (emulation)
- Require PSFirebird >= 1.1.0 (x86/ARM64 support)

Author: fdcastel

.github/workflows/build-and-test.yml

@@ -28,6 +28,10 @@ jobs:
           - os: windows-latest
             artifact-name: windows-arm64-binaries
             arch: ARM64
+            build-only: true
+          # Windows ARM64 native: build + test using Firebird snapshot-master (win-arm64).
+          # Firebird does not publish official ARM64 Windows releases; snapshots do.
+          - os: windows-11-arm
           - os: ubuntu-22.04
             artifact-name: linux-x64-binaries
           - os: ubuntu-22.04-arm
@@ -49,7 +53,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y unixodbc unixodbc-dev
 
       - name: Build, install and test
-        if: ${{ !matrix.arch || matrix.arch == 'x64' }}
+        if: ${{ !matrix.build-only }}
         shell: pwsh
         env:
           API_GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -59,14 +63,17 @@ jobs:
           Invoke-Build test -Configuration Release @archArgs -File ./firebird-odbc-driver.build.ps1
 
       - name: Build only (cross-compile)
-        if: ${{ matrix.arch && matrix.arch != 'x64' }}
+        if: ${{ matrix.build-only }}
         shell: pwsh
         env:
           API_GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: Invoke-Build build -Configuration Release -Architecture ${{ matrix.arch }} -File ./firebird-odbc-driver.build.ps1
+        run: |
+          $archArgs = @{}
+          if ('${{ matrix.arch }}') { $archArgs['Architecture'] = '${{ matrix.arch }}' }
+          Invoke-Build build -Configuration Release @archArgs -File ./firebird-odbc-driver.build.ps1
 
       - name: Upload artifacts (Windows)
-        if: runner.os == 'Windows'
+        if: runner.os == 'Windows' && matrix.artifact-name
         uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.artifact-name }}
@@ -76,7 +83,7 @@ jobs:
             build/Release/FirebirdODBC.pdb
 
       - name: Upload artifacts (Linux)
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' && matrix.artifact-name
         uses: actions/upload-artifact@v7
         with:
           name: ${{ matrix.artifact-name }}

firebird-odbc-driver.build.ps1

@@ -42,6 +42,22 @@ if ($IsWindowsOS) {
 	$DriverPath = Join-Path $BuildDir $DriverFileName
 }
 
+# Map build Architecture to PSFirebird RuntimeIdentifier (RID) and optional branch.
+# Used by build-test-databases to download the correct Firebird binaries.
+$FirebirdRid = switch ($Architecture) {
+	'Win32' { 'win-x86' }
+	default { '' }
+}
+$FirebirdBranch = ''
+
+# On native ARM64 Windows (no Architecture override = native ARM64 build),
+# use the Firebird snapshot-master branch which publishes win-arm64 binaries.
+if (-not $Architecture -and $IsWindowsOS -and
+	[System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -eq 'Arm64') {
+	$FirebirdRid = 'win-arm64'
+	$FirebirdBranch = 'master'
+}
+
 # Synopsis: Remove the build directory.
 task clean {
 	remove $BuildDir
@@ -69,7 +85,8 @@ task build {
 # Synopsis: Create Firebird test databases.
 task build-test-databases {
 	$fbVersion = '5.0.2'
-	$envPath = '/fbodbc-tests/fb502'
+	# Use a distinct env path for snapshot (branch) builds to avoid stale cache.
+	$envPath = if ($FirebirdBranch) { "/fbodbc-tests/snapshot-$FirebirdBranch" } else { '/fbodbc-tests/fb502' }
 	$dbPathUtf8 = '/fbodbc-tests/TEST.FB50.FDB'
 	$dbPathIso = '/fbodbc-tests/TEST-ISO.FB50.FDB'
 
@@ -83,11 +100,23 @@ task build-test-databases {
 	Import-Module PSFirebird
 
 	# Create or reuse Firebird environment
+	$fbExtraParams = @{}
+	if ($FirebirdRid) {
+		$fbExtraParams['RuntimeIdentifier'] = $FirebirdRid
+		print Cyan "Using Firebird RID: $FirebirdRid"
+	}
+	if ($FirebirdBranch) {
+		$fbExtraParams['Branch'] = $FirebirdBranch
+		print Cyan "Using Firebird snapshot branch: $FirebirdBranch"
+	} else {
+		$fbExtraParams['Version'] = $fbVersion
+	}
+
 	if (Test-Path (Join-Path $envPath 'firebird.msg')) {
 		$fb = Get-FirebirdEnvironment -Path $envPath
 		print Green "Reusing existing Firebird environment: $envPath"
 	} else {
-		$fb = New-FirebirdEnvironment -Version $fbVersion -Path $envPath -Force
+		$fb = New-FirebirdEnvironment -Path $envPath -Force @fbExtraParams
 		print Green "Firebird environment created: $envPath"
 	}
 
@@ -208,7 +237,13 @@ task . build
 #region Windows
 
 function Install-WindowsDriver {
-	$regBase = 'HKLM:\SOFTWARE\ODBC\ODBCINST.INI'
+	# 32-bit (x86) ODBC drivers must register under WOW6432Node so the
+	# 32-bit ODBC Driver Manager can find them.
+	$regBase = if ($Architecture -eq 'Win32') {
+		'HKLM:\SOFTWARE\WOW6432Node\ODBC\ODBCINST.INI'
+	} else {
+		'HKLM:\SOFTWARE\ODBC\ODBCINST.INI'
+	}
 	$regPath = Join-Path $regBase $DriverName
 	$driversPath = Join-Path $regBase 'ODBC Drivers'
 
@@ -233,7 +268,11 @@ function Install-WindowsDriver {
 }
 
 function Uninstall-WindowsDriver {
-	$regBase = 'HKLM:\SOFTWARE\ODBC\ODBCINST.INI'
+	$regBase = if ($Architecture -eq 'Win32') {
+		'HKLM:\SOFTWARE\WOW6432Node\ODBC\ODBCINST.INI'
+	} else {
+		'HKLM:\SOFTWARE\ODBC\ODBCINST.INI'
+	}
 	$regPath = Join-Path $regBase $DriverName
 	$driversPath = Join-Path $regBase 'ODBC Drivers'
 

install-prerequisites.ps1

@@ -21,5 +21,5 @@ if ($IsLinux) {
     Register-PackageSource -Name 'NuGet' -Location 'https://api.nuget.org/v3/index.json' -ProviderName NuGet -Force
 }
 
-Install-Module -Name PSFirebird -Force -AllowClobber -Scope CurrentUser -Repository PSGallery
+Install-Module -Name PSFirebird -MinimumVersion 1.2.0 -Force -AllowClobber -Scope CurrentUser -Repository PSGallery
 Install-Module -Name InvokeBuild -Force -Scope CurrentUser