Merge branch 'master' into multi-file-db-cleanup

Author: dyemanov

.github/actions/adjust-snapshot-buildno/action.yml

@@ -0,0 +1,20 @@
+name: Adjust snapshot build number
+description: Adjust snapshot build number
+
+runs:
+  using: composite
+  steps:
+    - id: adjust-snapshot-buildno
+      if:
+        github.repository == 'FirebirdSQL/firebird' &&
+        (github.ref_type == 'branch' &&
+          (github.ref_name == 'master' ||
+            (startsWith(github.ref_name, 'v') && endsWith(github.ref_name, '-release'))
+          )
+        ) ||
+        false
+      shell: bash
+      run: |
+        sed -i'' -e "s/SuffixKind=\(.*\)/SuffixKind=\"$(echo ${{ github.sha }} | cut -c 1-7)\"/" src/misc/writeBuildNum.sh
+        mkdir gen
+        src/misc/writeBuildNum.sh rebuildHeader

.github/workflows/main.yml

@@ -14,6 +14,9 @@ jobs:
         with:
           fetch-depth: 10
 
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
       - name: Prepare
         run: |
           sudo apt-get install libtool-bin libtomcrypt1 libtomcrypt-dev libtommath1 libtommath-dev libicu-dev zlib1g-dev cmake
@@ -55,6 +58,9 @@ jobs:
         with:
           fetch-depth: 10
 
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
       - name: Get Release Notes
         uses: ./.github/actions/get-release-notes
 
@@ -96,6 +102,9 @@ jobs:
         with:
           fetch-depth: 10
 
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
       - name: Get Release Notes
         uses: ./.github/actions/get-release-notes
 
@@ -123,7 +132,10 @@ jobs:
           fetch-depth: 10
 
       - name: Prepare
-        run: apk update && apk --no-cache --update add build-base libtool git autoconf automake cmake zlib-dev icu-dev ncurses-dev libedit-dev linux-headers tar
+        run: apk update && apk --no-cache --update add build-base libtool git autoconf automake cmake zlib-dev icu-dev ncurses-dev libedit-dev linux-headers tar sed
+
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
 
       - name: Build
         run: |
@@ -160,6 +172,9 @@ jobs:
         with:
           fetch-depth: 10
 
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
       - name: Prepare
         shell: cmd
         run: |
@@ -210,6 +225,9 @@ jobs:
         with:
           fetch-depth: 10
 
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
       - name: Get Release Notes
         uses: ./.github/actions/get-release-notes
 
@@ -271,7 +289,9 @@ jobs:
 
   build-macos:
     name: build-macos-${{ matrix.arch }}
-    runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-12' }}
+    runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
+    env:
+      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
     strategy:
       fail-fast: false
@@ -287,31 +307,24 @@ jobs:
           fetch-depth: 10
           submodules: 'true'
 
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
       - name: Prepare - Install tools
         run: |
           brew install automake autoconf-archive cmake libtool ninja
 
-      # libcxx build is not working with python >= 3.12
-      - name: Do not use preinstalled python >= 3.12
-        run: |
-          brew uninstall --ignore-dependencies [email protected]
-          [ -e /Library/Frameworks/Python.framework ] && \
-            sudo mv /Library/Frameworks/Python.framework /Library/Frameworks/Python.framework.dont-look-at-this
-          brew install [email protected]
-          ln -s "$(brew --prefix [email protected])/bin/python3" "$(brew --prefix [email protected])/bin/python"
-
-      - name: Cache - vcpkg
-        uses: actions/cache@v4
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v7
         with:
-          key: ${{ runner.os }}-vcpkg-0
-          path: |
-            $HOME/.cache/vcpkg/archives
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Build
         run: |
           export LIBTOOLIZE=glibtoolize
           export LIBTOOL=glibtool
-          export PATH="$(brew --prefix [email protected])/bin:$PATH"
 
           ./autogen.sh --with-builtin-tommath --with-builtin-tomcrypt
           make -j4
@@ -370,6 +383,9 @@ jobs:
         with:
           fetch-depth: 10
 
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
       - name: Prepare - install Linux tools
         run: |
           sudo apt-get install libtool-bin libtomcrypt1 libtomcrypt-dev libtommath1 libtommath-dev libicu-dev zlib1g-dev
@@ -419,6 +435,9 @@ jobs:
         with:
           fetch-depth: 10
 
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
       - name: Enable KVM
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
@@ -482,7 +501,7 @@ jobs:
           path: gen/Firebird-*-android-${{ matrix.arch }}-withDebugSymbols.tar.gz
 
       - name: Delete initial build
-        uses: geekyeggo/delete-artifact@v4
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: firebird-android-initial-${{ matrix.arch }}
 
@@ -503,6 +522,9 @@ jobs:
         with:
           fetch-depth: 10
 
+      - name: Adjust snapshot build number
+        uses: ./.github/actions/adjust-snapshot-buildno
+
       - name: Download final build (x86)
         uses: actions/download-artifact@v4
         with:

.github/workflows/qa.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: Download firebird installer
         id: download-artifact
-        uses: dawidd6/action-download-artifact@v2
+        uses: dawidd6/action-download-artifact@v6
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           workflow: main.yml

.github/workflows/tzdata-update.yml

@@ -18,12 +18,12 @@ jobs:
           - v4.0-release
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch }}
 
       - name: Checkout ICU
-        run: git clone --depth 1 https://github.com/unicode-org/icu-data.git -b main /tmp/icu-checkout
+        run: GIT_CLONE_PROTECTION_ACTIVE=false git clone --depth 1 https://github.com/unicode-org/icu-data.git -b main /tmp/icu-checkout
 
       - name: Check and update
         run: |

.vscode/c_cpp_properties.json

@@ -3,7 +3,10 @@
         {
             "name": "Linux",
             "includePath": [
-                "${workspaceFolder}/**"
+                "${workspaceFolder}/src/include/gen",
+                "${workspaceFolder}/src/include",
+                "${workspaceFolder}/extern/boost",
+                "${workspaceFolder}/extern/libcds"
             ],
             "defines": [
                 "DEV_BUILD"

.vscode/settings.json

@@ -8,11 +8,16 @@
 	"[markdown]": {
 		"files.trimTrailingWhitespace": false
 	},
+	"files.readonlyInclude": {
+		"temp/**": true
+	},
 
 	"files.insertFinalNewline": true,
-
-	"files.exclude": {
-		"temp": true,
-		"gen": true
+	"files.associations": {
+		"*.epp": "cpp"
+	},
+	"search.exclude": {
+		"temp/**": true,
+		"gen/**": true
 	}
 }

builds/docker/linux/arm32-arm64/Dockerfile

@@ -1,21 +1,21 @@
-ARG ARG_BASE=arm64v8/ubuntu:22.04
+ARG ARG_BASE=arm64v8/debian:bookworm
 ARG ARG_TARGET_ARCH=aarch64-pc-linux-gnu
 ARG ARG_CTNF_CONFIG=crosstool-ng-config-arm64
 
-ARG ARG_CTNG_VERSION=1.25.0
+ARG ARG_CTNG_VERSION=1.26.0
 ARG ARG_LIBTOOL_VERSION=2.4.6
 ARG ARG_NCURSES_VERSION=6.3
 ARG ARG_LTM_VERSION=1.2.0
-ARG ARG_ZLIB_VERSION=1.2.13
+ARG ARG_ZLIB_VERSION=1.3.1
 ARG ARG_ICU_VERSION=70-1
 
-ARG ARG_CPUCOUNT=6
+ARG ARG_CPUCOUNT=24
 
 ARG ARG_CTNG_UID=1000
 ARG ARG_CTNG_GID=1000
 
 
-FROM ubuntu:22.04 as builder
+FROM debian:bookworm as builder
 
 ARG ARG_TARGET_ARCH
 ARG ARG_CTNF_CONFIG
@@ -42,6 +42,7 @@ RUN groupadd -g $ARG_CTNG_GID ctng && \
 		sudo \
 		automake \
 		bison \
+		bzip2 \
 		chrpath \
 		flex \
 		gcc \
@@ -56,21 +57,21 @@ RUN groupadd -g $ARG_CTNG_GID ctng && \
 		libtool \
 		libtool-bin \
 		libtool-doc \
-		python2.7-dev \
 		python3-dev \
 		texinfo \
 		make \
 		curl \
 		wget \
 		unzip \
+		xz-utils \
 		nano && \
 	\
 	adduser ctng sudo && \
 	echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 USER ctng
 
-COPY --from=asfernandes/firebird-builder:fb5-x64-ng-v1 --chown=ctng:ctng /home/ctng/x-tools /home/ctng/x-tools
+COPY --from=asfernandes/firebird-builder:fb6-x64-ng-v1 --chown=ctng:ctng /home/ctng/x-tools /home/ctng/x-tools
 
 RUN mkdir ~/build && \
 	curl -SL --output ~/build/icu4c-${ARG_ICU_VERSION}-src.tgz https://github.com/unicode-org/icu/releases/download/release-${ARG_ICU_VERSION}/icu4c-`echo ${ARG_ICU_VERSION} | tr - _`-src.tgz && \
@@ -109,7 +110,7 @@ RUN sudo apt-get -y remove \
 		libtomcrypt-dev && \
 	sudo rm -rf /var/lib/apt/lists/*
 
-ENV PATH "/home/ctng/x-tools/x86_64-pc-linux-gnu/bin:${PATH}"
+ENV PATH "/home/ctng/x-tools/x86_64-pc-linux-gnu/bin:/home/ctng/x-tools/x86_64-pc-linux-gnu/x86_64-pc-linux-gnu/sysroot/usr/local/bin:${PATH}"
 ENV PATH "/home/ctng/x-tools/${ARG_TARGET_ARCH}/bin:/home/ctng/x-tools/${ARG_TARGET_ARCH}/${ARG_TARGET_ARCH}/sysroot/usr/local/bin:${PATH}"
 
 RUN cd ~/build && \
@@ -184,30 +185,27 @@ RUN cd ~/build && \
 	tar xvf icu4c-${ARG_ICU_VERSION}-src.tgz --strip 1 -C icu4c-${ARG_ICU_VERSION}-src && \
 	mkdir icu4c-${ARG_ICU_VERSION}-build-x86_64 && \
 	cd icu4c-${ARG_ICU_VERSION}-build-x86_64 && \
-	../icu4c-${ARG_ICU_VERSION}-src/source/runConfigureICU \
+	CXXFLAGS='-std=c++17 -static-libstdc++' ../icu4c-${ARG_ICU_VERSION}-src/source/runConfigureICU \
 		Linux \
-		--host=x86_64-pc-linux-gnu \
-		CXXFLAGS=-std=c++17 && \
+		--host=x86_64-pc-linux-gnu && \
 	make -j${ARG_CPUCOUNT}
 
 RUN cd ~/build && \
 	mkdir icu4c-${ARG_ICU_VERSION}-build && \
 	cd icu4c-${ARG_ICU_VERSION}-build && \
-	../icu4c-${ARG_ICU_VERSION}-src/source/runConfigureICU \
+	CXXFLAGS='-std=c++17 -static-libstdc++' ../icu4c-${ARG_ICU_VERSION}-src/source/runConfigureICU \
 		Linux \
 		--host=${ARG_TARGET_ARCH} \
 		--with-cross-build=/home/ctng/build/icu4c-${ARG_ICU_VERSION}-build-x86_64 \
 		--prefix=/home/ctng/x-tools/${ARG_TARGET_ARCH}/${ARG_TARGET_ARCH}/sysroot/usr/local \
-		--includedir=/home/ctng/x-tools/${ARG_TARGET_ARCH}/${ARG_TARGET_ARCH}/sysroot/usr/include \
-		CXXFLAGS=-std=c++17 && \
+		--includedir=/home/ctng/x-tools/${ARG_TARGET_ARCH}/${ARG_TARGET_ARCH}/sysroot/usr/include && \
 	make -j${ARG_CPUCOUNT} && \
 	make install
 
 
 FROM $ARG_BASE
 
 ARG ARG_TARGET_ARCH
-ARG ARG_CPUCOUNT
 ARG ARG_CTNG_UID
 ARG ARG_CTNG_GID
 
@@ -238,7 +236,6 @@ ENV LIBRARY_PATH "/home/ctng/x-tools/${ARG_TARGET_ARCH}/${ARG_TARGET_ARCH}/sysro
 ENV LD_LIBRARY_PATH "/usr/x86_64-linux-gnu/lib:/home/ctng/x-tools/${ARG_TARGET_ARCH}/${ARG_TARGET_ARCH}/sysroot/usr/local/lib"
 
 ENV BUILD_ARCH=$ARG_TARGET_ARCH
-ENV CPUCOUNT=$ARG_CPUCOUNT
 
 WORKDIR /firebird
 

builds/docker/linux/arm32-arm64/build-arm32.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
-docker build \
+docker buildx build \
 	--pull \
-	--build-arg ARG_BASE=arm32v7/ubuntu:22.04 \
+	--build-arg ARG_BASE=arm32v7/debian:bookworm \
 	--build-arg ARG_TARGET_ARCH=arm-pc-linux-gnueabihf \
 	--build-arg ARG_CTNF_CONFIG=crosstool-ng-config-arm32 \
-	-t asfernandes/firebird-builder:fb5-arm32-ng-v1 .
+	-t asfernandes/firebird-builder:fb6-arm32-ng-v1 .

builds/docker/linux/arm32-arm64/build-arm64.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
-docker build \
+docker buildx build \
 	--pull \
-	--build-arg ARG_BASE=arm64v8/ubuntu:22.04 \
+	--build-arg ARG_BASE=arm64v8/debian:bookworm \
 	--build-arg ARG_TARGET_ARCH=aarch64-pc-linux-gnu \
 	--build-arg ARG_CTNF_CONFIG=crosstool-ng-config-arm64 \
-	-t asfernandes/firebird-builder:fb5-arm64-ng-v1 .
+	-t asfernandes/firebird-builder:fb6-arm64-ng-v1 .