Merge branch 'master' into work/fix-long-context-aliases

Author: dyemanov

.github/actions/create-release/action.yml

@@ -1,6 +1,3 @@
-# TODO: Replace asfernandes/action-gh-release@master by softprops/action-gh-release@v1
-# once https://github.com/softprops/action-gh-release/pull/343 is merged.
-
 name: Create release
 description: Create release
 
@@ -44,7 +41,7 @@ runs:
 
     - name: Release
       id: release_try1
-      uses: asfernandes/action-gh-release@master
+      uses: softprops/action-gh-release@master
       if: steps.release-info.outputs.artifacts-tag
       continue-on-error: true
       with:
@@ -65,7 +62,7 @@ runs:
         files: ${{ inputs.uploadFiles }}
 
     - name: Release (retry)
-      uses: asfernandes/action-gh-release@master
+      uses: softprops/action-gh-release@master
       if: |
         steps.release-info.outputs.artifacts-tag &&
         steps.release_try1.outcome == 'failure'

.github/workflows/main.yml

@@ -156,14 +156,13 @@ jobs:
     if: github.ref_type != 'tag'
     runs-on: ${{ matrix.os }}
     env:
-      VS_VERSION: ${{ (matrix.os == 'windows-2019' && '2019' || (matrix.os == 'windows-2022' && '2022' || '')) }}
+      VS_VERSION: 2022
 
     strategy:
       fail-fast: false
       matrix:
         os:
-          - windows-2022
-          - windows-2019
+          - windows-2025
         platform: [x64, x86]
 
     steps:
@@ -186,7 +185,7 @@ jobs:
         shell: cmd
         env:
           PLATFORM: ${{ matrix.platform }}
-          VS_SCRIPT: ${{ matrix.os == 'windows-2022' && 'C:\Program Files\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat' || 'C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat' }}
+          VS_SCRIPT: C:\Program Files\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat
         run: |
           set SEVENZIP=C:\Program Files\7-Zip
           set INNO6_SETUP_PATH=C:\Program Files (x86)\Inno Setup 6
@@ -211,6 +210,78 @@ jobs:
           name: firebird-windows-vs-${{ env.VS_VERSION }}-${{ matrix.platform }}-installer
           path: builds/install_images/*-windows-${{ matrix.platform }}.exe
 
+  # Windows ARM container is not yet available, so official build is done directly in Windows 11 runner
+  build-windows-arm64:
+    #if: github.ref_type != 'tag'
+    runs-on: windows-11-arm
+    env:
+      VS_VERSION: 2022
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
+      - name: Prepare
+        shell: cmd
+        run: |
+          for /r %%i in (*.bat) do unix2dos "%%i"
+          REM choco uninstall --no-progress --yes innosetup
+          choco install --no-progress --yes innosetup --version=6.4.0
+
+      - name: Build
+        shell: cmd
+        env:
+          VS_SCRIPT: C:\Program Files\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat
+        run: |
+          set SEVENZIP=C:\Program Files\7-Zip
+          set INNO6_SETUP_PATH=C:\Program Files (x86)\Inno Setup 6
+          set FB_VS_ARCH=arm64
+          set FB_PROCESSOR_ARCHITECTURE=ARM64
+          call "%VS_SCRIPT%" -arch=%FB_VS_ARCH%
+          cd builds\win32
+          call run_all.bat PDB
+          call run_tests.bat
+
+      - name: Upload zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: firebird-windows-arm64-zip
+          path: builds/install_images/Firebird-*-windows-arm64.zip
+
+      - name: Upload zip (withDebugSymbols)
+        uses: actions/upload-artifact@v4
+        with:
+          name: firebird-windows-arm64-withDebugSymbols-zip
+          path: builds/install_images/Firebird-*-windows-arm64-withDebugSymbols.zip
+
+      - name: Upload installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: firebird-windows-arm64-installer
+          path: builds/install_images/*-windows-arm64.exe
+
+      - name: Upload installer (withDebugSymbols)
+        uses: actions/upload-artifact@v4
+        with:
+          name: firebird-windows-arm64-withDebugSymbols-installer
+          path: builds/install_images/*-windows-arm64-withDebugSymbols.exe
+
+      - name: Create release
+        uses: ./.github/actions/create-release
+        with:
+          token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }}
+          deletePatterns:  |
+            Firebird-*-windows-arm64*.exe
+            Firebird-*-windows-arm64*.zip
+          uploadFiles: |
+            builds/install_images/Firebird-*-windows-arm64*.exe
+            builds/install_images/Firebird-*-windows-arm64*.zip
+
   build-windows-docker:
     runs-on: windows-2022
 
@@ -290,8 +361,6 @@ jobs:
   build-macos:
     name: build-macos-${{ matrix.arch }}
     runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
-    env:
-      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
     strategy:
       fail-fast: false
@@ -312,14 +381,16 @@ jobs:
 
       - name: Prepare - Install tools
         run: |
-          brew install automake autoconf-archive cmake libtool ninja
+          brew install --quiet automake autoconf-archive libtool ninja
 
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v7
+      - name: Restore vcpkg cache
+        uses: actions/cache/restore@v4
+        id: restore-vcpkg-cache
         with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+          path: ~/.cache/vcpkg/archives
+          key: vcpkg-cache-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('vcpkg-custom/**', 'vcpkg.json', 'vcpkg-configuration.json') }}
+          restore-keys: |
+            vcpkg-cache-${{ runner.os }}-${{ matrix.arch }}-
 
       - name: Build
         run: |
@@ -347,6 +418,14 @@ jobs:
           mkdir gen/artifacts
           mv gen/Release/*.pkg gen/artifacts
 
+      - name: Save vcpkg cache
+        uses: actions/cache/save@v4
+        # Saves if the key changed (hashes on vcpkg/**, vcpkg.json, vcpkg-configuration.json)
+        if: steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
+        with:
+          path: ~/.cache/vcpkg/archives
+          key: ${{ steps.restore-vcpkg-cache.outputs.cache-primary-key }}
+
       - name: Upload installer
         uses: actions/upload-artifact@v4
         with:

.github/workflows/tzdata-update.yml

@@ -1,6 +1,7 @@
 name: tzdata-update
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '0 11 * * *'
 
@@ -22,12 +23,14 @@ jobs:
         with:
           ref: ${{ matrix.branch }}
 
-      - name: Checkout ICU
-        run: GIT_CLONE_PROTECTION_ACTIVE=false git clone --depth 1 https://github.com/unicode-org/icu-data.git -b main /tmp/icu-checkout
+      - name: Download ICU
+        run: |
+          wget --no-verbose -O /tmp/icu.zip https://github.com/unicode-org/icu-data/archive/refs/heads/main.zip
+          unzip -d /tmp /tmp/icu.zip
 
       - name: Check and update
         run: |
-          VERSION=`ls /tmp/icu-checkout/tzdata/icunew/ -r1a |head -1`
+          VERSION=`ls /tmp/icu-data-main/tzdata/icunew/ -r1a |head -1`
           echo Last version: $VERSION
 
           if [ "$VERSION" == "`cat extern/icu/tzdata/version.txt`" ]

builds/docker/windows/Dockerfile

@@ -10,8 +10,8 @@ SHELL ["cmd", "/S", "/C"]
 # - Open (extract) the downloaded file, for example using 7-Zip.
 # - Open file vs_setup_bootstrapper.json and extract the installChannelUri to VS_INSTALL_CHANNEL_URI.
 
-# 17.7.4
-ARG VS_INSTALL_CHANNEL_URI=https://aka.ms/vs/17/release/134599118_118780349/channel
+# 17.13.6
+ARG VS_INSTALL_CHANNEL_URI=https://aka.ms/vs/17/release/656692964_-684260800/channel
 
 ADD https://aka.ms/vs/17/release/vs_buildtools.exe C:/temp/vs_BuildTools.exe
 

builds/install/arch-specific/hpux/super/postInstall.sh.in

@@ -137,7 +137,7 @@ writeNewPassword() {
     if [ $NewPasswd = "masterkey" ]
       then
         echo "# for install on `hostname` at time `date`" >> $DBAPasswordFile
-        echo "# You should change this password at the earliest oportunity" >> $DBAPasswordFile
+        echo "# You should change this password at the earliest opportunity" >> $DBAPasswordFile
       else 
         echo "# generated on `hostname` at time `date`" >> $DBAPasswordFile
     fi

builds/install/arch-specific/win32/BuildExecutableInstall.bat

@@ -176,7 +176,11 @@ set FBBUILD_INSTALL_IMAGES=%FB_ROOT_PATH%\builds\install_images
 @if "%FB_TARGET_PLATFORM%"=="x64" (
   set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%%FBBUILD_FILENAME_SUFFIX%-windows-x64
 ) else (
-  set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%%FBBUILD_FILENAME_SUFFIX%-windows-x86
+  @if "%FB_TARGET_PLATFORM%"=="arm64" (
+    set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%%FBBUILD_FILENAME_SUFFIX%-windows-arm64
+  ) else (
+    set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%%FBBUILD_FILENAME_SUFFIX%-windows-x86
+  )
 )
 
 @setlocal
@@ -489,7 +493,11 @@ for %%v in (IPLicense.txt IDPLicense.txt ) do (
 ::
 ::=================================================
 @echo.
-@call %ISCC_COMMAND% %FB_ROOT_PATH%\builds\install\arch-specific\win32\FirebirdInstall.iss
+if "%FB_TARGET_PLATFORM%"=="arm64" (
+  @call %ISCC_COMMAND% /DPlatformTarget=arm64 %FB_ROOT_PATH%\builds\install\arch-specific\win32\FirebirdInstall.iss
+) else (
+  @call %ISCC_COMMAND% %FB_ROOT_PATH%\builds\install\arch-specific\win32\FirebirdInstall.iss
+)
 @echo.
 
 ::End of ISX_PACK

builds/install/arch-specific/win32/FirebirdInstall.iss

@@ -212,13 +212,18 @@
 ;Assume native platform
 #if IsWin64
 #define PlatformTarget "x64"
+;---- IsArm64 is not available in preprocessor, so /DPlatformTarget=arm64 should be passed in the command line
+;#elif IsArm64
+;#define PlatformTarget "arm64"
 #else
 #define PlatformTarget "win32"
 #endif
 #endif
 
 #if PlatformTarget == "x64"
 #define ReleasePlatformTarget "x64"
+#elif PlatformTarget == "arm64"
+#define ReleasePlatformTarget "arm64"
 #else
 #define ReleasePlatformTarget "x86"
 #endif
@@ -309,7 +314,12 @@ WizardResizable=yes
 WizardImageFile={#ScriptsDir}\firebird_install_logo1.bmp
 WizardSmallImageFile={#ScriptsDir}\firebird_install_logo1.bmp
 
+#if PlatformTarget == "arm64"
+DefaultDirName={code:ChooseInstallDir|{commonpf64}\Firebird\Firebird_{#AppVer}}
+#else
 DefaultDirName={code:ChooseInstallDir|{commonpf}\Firebird\Firebird_{#AppVer}}
+#endif
+
 DefaultGroupName=Firebird {#GroupnameVer} ({#PlatformTarget})
 
 UninstallDisplayIcon={code:ChooseUninstallIcon|{#UninstallBinary}}
@@ -327,6 +337,9 @@ SetupMutex={#MyAppName}
 #if PlatformTarget == "x64"
 ArchitecturesAllowed=x64
 ArchitecturesInstallIn64BitMode=x64
+#elif PlatformTarget == "arm64"
+ArchitecturesAllowed=arm64
+ArchitecturesInstallIn64BitMode=arm64
 #endif
 
 ;This feature is incomplete, as more thought is required.
@@ -398,9 +411,12 @@ Name: CopyFbClientAsGds32Task; Description: {cm:CopyFbClientAsGds32Task}; Compon
 [Run]
 ; due to the changes required to support MSVC15 support for earlier versions is now broken.
 #if Int(msvc_runtime_major_version,14) >= 14
+#if PlatformTarget != "arm64"
 Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_Win32.msi"" /L*v ""{tmp}\vccrt{#msvc_runtime_library_version}_Win32.log"" "; StatusMsg: "Installing MSVC 32-bit runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
-#if PlatformTarget == "x64"
+#elif PlatformTarget == "x64"
 Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_x64.msi"" /L*v ""{tmp}\vccrt{#msvc_runtime_library_version}_x64.log"" ";  StatusMsg: "Installing MSVC 64-bit runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
+#elif PlatformTarget == "arm64"
+; Filename: msiexec.exe; Parameters: "/qn /norestart /i ""{tmp}\vccrt{#msvc_runtime_library_version}_arm64.msi"" /L*v ""{tmp}\vccrt{#msvc_runtime_library_version}_arm64.log"" ";  StatusMsg: "Installing MSVC ARM64 runtime libraries to system directory"; Check: HasWI30; Components: ClientComponent;
 #endif
 #endif
 
@@ -547,8 +563,10 @@ Source: {#WOW64Dir}\msvcp{#msvc_runtime_file_version}.dll; DestDir: {app}\WOW64;
 ;In addition, O/S must have Windows Installer 3.0.
 Source: {#FilesDir}\system32\vccrt{#msvc_runtime_library_version}_x64.msi; DestDir: {tmp};  Check: HasWI30; MinVersion: {#MinVer}; Components: ClientComponent;
 Source: {#WOW64Dir}\system32\vccrt{#msvc_runtime_library_version}_Win32.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: {#MinVer}; Components: ClientComponent;
-#else
+#elif PlatformTarget == "Win32"
 Source: {#FilesDir}\system32\vccrt{#msvc_runtime_library_version}_Win32.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: {#MinVer}; Components: ClientComponent;
+#elif PlatformTarget == "arm64"
+; Source: {#FilesDir}\system32\vccrt{#msvc_runtime_library_version}_arm64.msi; DestDir: {tmp}; Check: HasWI30; MinVersion: {#MinVer}; Components: ClientComponent;
 #endif
 #endif
 

builds/install/misc/firebird.conf

@@ -700,7 +700,7 @@
 # active connections. If you do not like its default 2-hour keepalive timeout,
 # then adjust your server OS settings appropriately. On UNIX-like OS's,
 # modify contents of /proc/sys/net/ipv4/tcp_keepalive_*. On Windows,
-# follow instrutions of this article:
+# follow instructions of this article:
 # https://learn.microsoft.com/en-us/troubleshoot/windows-client/networking/tcpip-and-nbt-configuration-parameters
 #
 # Per-connection configurable.