From b5bd0f18718f168a0ef81e369673bd239dad2abc Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 26 Sep 2022 14:53:25 +0200 Subject: Remove TestDocs in Ubuntu 22.04 nightly build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qdoc_qtattributionsscanner was also removed. When we have TestDocs in the future, we need to rebuild qdoc_qtattributionsscanner for Ubuntu 22.04. Task-number: QTBUG-106948 Change-Id: I56bfda453cfddae97fa03b2a5eca91548152afe5 Reviewed-by: Topi Reiniö --- coin/platform_configs/nightly_ubuntu_22_04.yaml | 2 +- .../85-qdoc_qtattributionsscanner.sh | 70 ---------------------- 2 files changed, 1 insertion(+), 71 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh diff --git a/coin/platform_configs/nightly_ubuntu_22_04.yaml b/coin/platform_configs/nightly_ubuntu_22_04.yaml index 9929924a..7364f4a1 100644 --- a/coin/platform_configs/nightly_ubuntu_22_04.yaml +++ b/coin/platform_configs/nightly_ubuntu_22_04.yaml @@ -4,7 +4,7 @@ Configurations: # cmake_platforms.yaml Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure'] + Features: ['Sccache', 'Documentation', 'UseConfigure'] Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace' - Id: 'Ubuntu-22.04-host' diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh deleted file mode 100755 index 853fa279..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2021 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 3 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL3 included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 3 requirements -## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 2.0 or (at your option) the GNU General -## Public license version 3 or any later version approved by the KDE Free -## Qt Foundation. The licenses are as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-2.0.html and -## https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# Provisions qdoc and qtattributionsscanner binaries; these are used for -# documentation testing without the need for a dependency to qttools. - -set -e - -# shellcheck source=./check_and_set_proxy.sh -"${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" -# shellcheck source=./DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -version="836becf90211c483d3d65987914c9fd962644be9" -sha1="ef8c886480b57dfc799c7c2dd71ed859787f94a8" -url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" -url_cached="http://ci-files01-hki.intra.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" - -zip="/tmp/qdoc-qtattributionsscanner.7z" -destination="/opt/qt-doctools" - -sudo mkdir -p $destination -sudo chmod 755 $destination -DownloadURL $url_cached $url $sha1 $zip -if command -v 7zr &> /dev/null; then - sudo 7zr x $zip -o$destination/ -else - sudo 7z x $zip -o$destination/ -fi -sudo chown -R qt:users $destination -rm -rf $zip - -echo -e "qdoc = $version\nqtattributionsscanner = $version" >> ~/versions.txt -- cgit v1.2.3