From 134c07923cc1a29e1a4e749cfde9d6067ffd4266 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 27 May 2022 16:45:58 +0200 Subject: [PATCH] Rename protobuf provisioning scripts Use correct protobuf project name for provisioning scripts. This also should trigger provisioning for all the involved platforms. Change-Id: I4cfa74c1d41f497db528ee3ae152db1d51de821a Reviewed-by: Alexey Edelev --- ...stall_protobuff.sh => install_protobuf.sh} | 0 ...ll_protobuff.sh => 60-install_protobuf.sh} | 4 +- ...ll_protobuff.sh => 60-install_protobuf.sh} | 4 +- .../60-install_protobuf.sh} | 4 +- .../60-install_protobuf.sh} | 4 +- .../60-install_protobuff.sh | 46 ------------------- .../60-install_protobuf.sh | 46 +++++++++++++++++++ .../60-install_protobuf.sh | 46 +++++++++++++++++++ .../60-install_protobuff.sh | 46 ------------------- ...ll_protobuff.sh => 35-install_protobuf.sh} | 4 +- .../35-install_protobuf.sh} | 4 +- .../35-install_protobuf.sh} | 4 +- .../35-install_protobuf.sh} | 4 +- .../35-install_protobuff.sh | 46 ------------------- 14 files changed, 108 insertions(+), 154 deletions(-) rename coin/provisioning/common/unix/{install_protobuff.sh => install_protobuf.sh} (100%) rename coin/provisioning/qtci-linux-CentOS-8.3-x86_64/{60-install_protobuff.sh => 60-install_protobuf.sh} (94%) mode change 100755 => 100644 rename coin/provisioning/qtci-linux-RHEL-8.2-x86_64/{60-install_protobuff.sh => 60-install_protobuf.sh} (94%) rename coin/provisioning/{qtci-linux-RHEL-8.4-x86_64/60-install_protobuff.sh => qtci-linux-Ubuntu-18.04-x86_64/60-install_protobuf.sh} (94%) rename coin/provisioning/{qtci-linux-Ubuntu-18.04-x86_64/60-install_protobuff.sh => qtci-linux-Ubuntu-20.04-x86_64/60-install_protobuf.sh} (94%) delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-install_protobuff.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/60-install_protobuf.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/60-install_protobuf.sh delete mode 100755 coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/60-install_protobuff.sh rename coin/provisioning/qtci-macos-10.15-x86_64/{35-install_protobuff.sh => 35-install_protobuf.sh} (94%) rename coin/provisioning/{qtci-macos-11-x86_64/35-install_protobuff.sh => qtci-macos-11.0-arm/35-install_protobuf.sh} (94%) rename coin/provisioning/{qtci-macos-11.0-arm/35-install_protobuff.sh => qtci-macos-12-x86_64/35-install_protobuf.sh} (94%) rename coin/provisioning/{qtci-macos-12-x86_64/35-install_protobuff.sh => qtci-macos-12.0-arm/35-install_protobuf.sh} (94%) delete mode 100755 coin/provisioning/qtci-macos-12.0-arm/35-install_protobuff.sh diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuf.sh similarity index 100% rename from coin/provisioning/common/unix/install_protobuff.sh rename to coin/provisioning/common/unix/install_protobuf.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuf.sh old mode 100755 new mode 100644 similarity index 94% rename from coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuff.sh rename to coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuf.sh index 2f55353a..19c8af39 --- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuff.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuf.sh @@ -41,6 +41,6 @@ set -ex -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/60-install_protobuf.sh similarity index 94% rename from coin/provisioning/qtci-linux-RHEL-8.2-x86_64/60-install_protobuff.sh rename to coin/provisioning/qtci-linux-RHEL-8.2-x86_64/60-install_protobuf.sh index 2f55353a..19c8af39 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/60-install_protobuff.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/60-install_protobuf.sh @@ -41,6 +41,6 @@ set -ex -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-install_protobuf.sh similarity index 94% rename from coin/provisioning/qtci-linux-RHEL-8.4-x86_64/60-install_protobuff.sh rename to coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-install_protobuf.sh index 2f55353a..19c8af39 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/60-install_protobuff.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-install_protobuf.sh @@ -41,6 +41,6 @@ set -ex -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-install_protobuf.sh similarity index 94% rename from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-install_protobuff.sh rename to coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-install_protobuf.sh index 2f55353a..19c8af39 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-install_protobuff.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-install_protobuf.sh @@ -41,6 +41,6 @@ set -ex -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-install_protobuff.sh deleted file mode 100755 index 2f55353a..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-install_protobuff.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" - diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/60-install_protobuf.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/60-install_protobuf.sh new file mode 100644 index 00000000..19c8af39 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/60-install_protobuf.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" + diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/60-install_protobuf.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/60-install_protobuf.sh new file mode 100755 index 00000000..19c8af39 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/60-install_protobuf.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" + diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/60-install_protobuff.sh deleted file mode 100755 index 2f55353a..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/60-install_protobuff.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" - diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/35-install_protobuff.sh b/coin/provisioning/qtci-macos-10.15-x86_64/35-install_protobuf.sh similarity index 94% rename from coin/provisioning/qtci-macos-10.15-x86_64/35-install_protobuff.sh rename to coin/provisioning/qtci-macos-10.15-x86_64/35-install_protobuf.sh index 08c955e9..2ef3eb8f 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/35-install_protobuff.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/35-install_protobuf.sh @@ -41,6 +41,6 @@ set -ex -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" diff --git a/coin/provisioning/qtci-macos-11-x86_64/35-install_protobuff.sh b/coin/provisioning/qtci-macos-11.0-arm/35-install_protobuf.sh similarity index 94% rename from coin/provisioning/qtci-macos-11-x86_64/35-install_protobuff.sh rename to coin/provisioning/qtci-macos-11.0-arm/35-install_protobuf.sh index 08c955e9..2ef3eb8f 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/35-install_protobuff.sh +++ b/coin/provisioning/qtci-macos-11.0-arm/35-install_protobuf.sh @@ -41,6 +41,6 @@ set -ex -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" diff --git a/coin/provisioning/qtci-macos-11.0-arm/35-install_protobuff.sh b/coin/provisioning/qtci-macos-12-x86_64/35-install_protobuf.sh similarity index 94% rename from coin/provisioning/qtci-macos-11.0-arm/35-install_protobuff.sh rename to coin/provisioning/qtci-macos-12-x86_64/35-install_protobuf.sh index 08c955e9..2ef3eb8f 100755 --- a/coin/provisioning/qtci-macos-11.0-arm/35-install_protobuff.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/35-install_protobuf.sh @@ -41,6 +41,6 @@ set -ex -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" diff --git a/coin/provisioning/qtci-macos-12-x86_64/35-install_protobuff.sh b/coin/provisioning/qtci-macos-12.0-arm/35-install_protobuf.sh similarity index 94% rename from coin/provisioning/qtci-macos-12-x86_64/35-install_protobuff.sh rename to coin/provisioning/qtci-macos-12.0-arm/35-install_protobuf.sh index 08c955e9..2ef3eb8f 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/35-install_protobuff.sh +++ b/coin/provisioning/qtci-macos-12.0-arm/35-install_protobuf.sh @@ -41,6 +41,6 @@ set -ex -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" diff --git a/coin/provisioning/qtci-macos-12.0-arm/35-install_protobuff.sh b/coin/provisioning/qtci-macos-12.0-arm/35-install_protobuff.sh deleted file mode 100755 index 08c955e9..00000000 --- a/coin/provisioning/qtci-macos-12.0-arm/35-install_protobuff.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2020 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$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" -