From 333cbd059225773fcf7d329c61e7df9d4be2bff7 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Wed, 17 Jul 2024 13:32:39 +0200 Subject: [PATCH] Coin: Enable firebird provisioning Enable Firebird provisioning for - Windows 10 22H2 - Windows 11 23H2 - Ubuntu 22.04 x86_64 - RHEL 9.2 x86_64 - SLES 15 SP5 x86_64 - openSUSE 15.5 x86_64 Change-Id: I075d4c468ed7c103b9e1090aea3ff36014b4e8fc Reviewed-by: Axel Spoerl --- coin/platform_configs/cmake_platforms.yaml | 2 +- .../cmake_platforms_static_tests.yaml | 4 +-- .../common/linux/install-firebird.sh | 33 ++++++++++++++----- .../common/windows/install-firebird.ps1 | 12 +++---- .../qtci-linux-RHEL-9.2-x86_64/90-firebird.sh | 8 +++++ .../90-firebird.sh | 8 +++++ .../90-firebird.sh | 8 +++++ .../90-firebird.sh | 8 +++++ .../90-firebird.ps1 | 1 + .../90-firebird.ps1 | 1 + 10 files changed, 67 insertions(+), 18 deletions(-) mode change 100755 => 100644 coin/provisioning/common/windows/install-firebird.ps1 create mode 100755 coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-firebird.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-firebird.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-firebird.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-firebird.sh create mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/90-firebird.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/90-firebird.ps1 diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index e345340a531..d4fa916bf7c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -123,7 +123,7 @@ Configurations: Template: 'qtci-linux-SLES-15_SP5-x86_64-50' Compiler: 'GCC' Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Configure arguments: '-nomake examples -static -no-sql-mysql' + Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index 0a8f8c6b471..571fc620113 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -5,7 +5,7 @@ Configurations: Template: 'qtci-linux-SLES-15_SP5-x86_64-50' Compiler: 'GCC' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] - Configure arguments: '-nomake examples -static -no-sql-mysql' + Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' ] @@ -14,7 +14,7 @@ Configurations: Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] - Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib' + Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', diff --git a/coin/provisioning/common/linux/install-firebird.sh b/coin/provisioning/common/linux/install-firebird.sh index fbe3744f65e..3d37ee02992 100755 --- a/coin/provisioning/common/linux/install-firebird.sh +++ b/coin/provisioning/common/linux/install-firebird.sh @@ -4,21 +4,38 @@ set -e -SSL_VER=$1 -PACK_TYPE=$2 PROVISIONING_DIR="$(dirname "$0")/../../" # shellcheck source=../unix/common.sourced.sh source "${BASH_SOURCE%/*}/../unix/common.sourced.sh" # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - +version=5.0.1 +fullversion=Firebird-${version}.1469-0-linux-x64 +instpath=/opt/Firebird localRepo=http://ci-files01-hki.ci.qt.io/input/docker -upstreamRepo=https://github.com/FirebirdSQL/firebird/releases/download/v5.0.0 -packageFile=Firebird-5.0.0.1306-0-linux-x64.tar.gz -sha=9a04b54d308ca10394d5339fe039b9e367b441c2 +upstreamRepo=https://github.com/FirebirdSQL/firebird/releases/download/v${version} +packageFile=${fullversion}.tar.gz +sha=369e9187913c6e1bc8a0f79f9e1826c0e35dd72f DownloadURL $localRepo/$packageFile $upstreamRepo/$packageFile $sha /tmp/$packageFile -tar xf /tmp/$packageFile -C /tmp -/tmp/Firebird-5.0.0.1306-0-linux-x64/install.sh -silent +echo "Unpacking ${packageFile}" +tar xvf /tmp/${packageFile} -C /tmp +echo "Checking unpacked directory" +echo "Starting install" +if [ -d "${instpath}" ]; then + sudo rm -rf ${instpath}; +fi +sudo mkdir ${instpath} +sudo tar xf /tmp/${fullversion}/buildroot.tar.gz -C ${instpath} + +echo "Cleaning up" +rm -rf /tmp/${fullversion} +rm -rf /tmp/${packageFile} + +SetEnvVar "Interbase_ROOT" "${instpath}/opt/firebird/" + +echo "Firebird = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-firebird.ps1 b/coin/provisioning/common/windows/install-firebird.ps1 old mode 100755 new mode 100644 index 6a60373096f..3c7c346d35b --- a/coin/provisioning/common/windows/install-firebird.ps1 +++ b/coin/provisioning/common/windows/install-firebird.ps1 @@ -5,16 +5,15 @@ # This script installs firebird $version. -$version = "5.0.0" -$fullversion = "$version.1306-0" +$version = "5.0.1" +$fullversion = "$version.1469-0" $packagex64 = "C:\Windows\temp\Firebird-$fullversion-windows-x64.zip" # Install x64 bit versions -$architecture = "x64" -$installFolder = "C:\Utils\postgresql" +$installFolder = "C:\Utils\firebird" $externalUrl = "https://github.com/FirebirdSQL/firebird/releases/download/v$version/Firebird-$fullversion-windows-x64.zip" $internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\Firebird-$fullversion-windows-x64.zip" -$sha1 = "3cedcdc0a0f8b9e313d0ca11ac06c90c0b7deb3f" +$sha1 = "7b56ea692215b128415ef9599e18c40bef12152f" Write-Host "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 @@ -25,8 +24,7 @@ Extract-7Zip $packagex64 $installFolder Write-Host "Remove downloaded $packagex64 ..." Remove $packagex64 -Set-EnvironmentVariable "Interbase_INCLUDEDIR" "$installFolder\include" -Set-EnvironmentVariable "Interbase_LIBDIR" "$installFolder\lib" +Set-EnvironmentVariable "Interbase_ROOT" "$installFolder" # Store version information to ~/versions.txt, which is used to print version information to provision log. Write-Output "Firebird = $fullversion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-firebird.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-firebird.sh new file mode 100755 index 00000000000..c817fefd1a6 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-firebird.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-firebird.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-firebird.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-firebird.sh new file mode 100755 index 00000000000..c817fefd1a6 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-firebird.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-firebird.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-firebird.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-firebird.sh new file mode 100755 index 00000000000..c817fefd1a6 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-firebird.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-firebird.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-firebird.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-firebird.sh new file mode 100755 index 00000000000..c817fefd1a6 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-firebird.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-firebird.sh" diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/90-firebird.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/90-firebird.ps1 new file mode 100644 index 00000000000..45eae463947 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/90-firebird.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-firebird.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/90-firebird.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/90-firebird.ps1 new file mode 100644 index 00000000000..45eae463947 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/90-firebird.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-firebird.ps1"