From 9381c3673bb0b42f671c6351fdbdd09f376df1c2 Mon Sep 17 00:00:00 2001 From: Tatiana Borisova Date: Wed, 15 Oct 2025 11:14:28 +0200 Subject: [PATCH] Update qtopenapi provisioning - add openSUSE15.6 build configuration for qtopenapi. - add rhel9.4 build configuration for qtopenapi. - delete macos15-x86_64 build configuration for qtopenapi, because the current qtopenapi code only builds go binaries targeting arm64 architecture, and the x86_64 configuration would fail trying to run those binaries. Task-number: QTBUG-140130 Change-Id: Ia4f1b91345d3d7a87916ceee319a6037318fac63 Reviewed-by: Alexandru Croitor --- coin/platform_configs/qtopenapi.yaml | 3 ++- coin/provisioning/common/unix/install_openapi.sh | 2 +- coin/provisioning/qtci-linux-RHEL-9.4-x86_64/51-openapi.sh | 7 +++++++ .../qtci-linux-openSUSE-15.6-x86_64/51-openapi.sh | 7 +++++++ 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100755 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/51-openapi.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/51-openapi.sh diff --git a/coin/platform_configs/qtopenapi.yaml b/coin/platform_configs/qtopenapi.yaml index 905461c4..6d1a28ee 100644 --- a/coin/platform_configs/qtopenapi.yaml +++ b/coin/platform_configs/qtopenapi.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ macos.yaml: [ - "macos-14-x86_64-tests", "macos-14-arm64-tests", "macos-arm64-developer-build", ], @@ -10,6 +9,8 @@ Include: [ "ubuntu-24.04-x64-developer-build", "ubuntu-24.04-x64-x11-tests", "ubuntu-24.04-x64-developer-build-x11-tests", + "rhel-9.4", + "opensuse-15.6-developer-build", ] ] Configurations: [] diff --git a/coin/provisioning/common/unix/install_openapi.sh b/coin/provisioning/common/unix/install_openapi.sh index 4c50a057..83ea0be3 100755 --- a/coin/provisioning/common/unix/install_openapi.sh +++ b/coin/provisioning/common/unix/install_openapi.sh @@ -17,7 +17,7 @@ targetFile="openapi-generator-cli.jar" DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFile" -sudo mkdir "$targetFolder" +sudo mkdir -p "$targetFolder" sudo mv "$targetFile" "$targetFolder" SetEnvVar "PATH" "$targetFolder:\$PATH" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/51-openapi.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/51-openapi.sh new file mode 100755 index 00000000..e709fa70 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/51-openapi.sh @@ -0,0 +1,7 @@ +#!/bin/bash +#Copyright (C) 2025 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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install_openapi.sh" + diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/51-openapi.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/51-openapi.sh new file mode 100755 index 00000000..e709fa70 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/51-openapi.sh @@ -0,0 +1,7 @@ +#!/bin/bash +#Copyright (C) 2025 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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install_openapi.sh" +