From 775fff4d4a3e308fc4876cf1101299ba3f30e0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aku=20Pietik=C3=A4inen?= Date: Fri, 5 Sep 2025 12:05:17 +0300 Subject: [PATCH] Use common p7zip install script and remove unnecessary brew update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id704953bf2eb9a2cfb11dbdb47451aed7bbc736b Task-number: QTQAINFRA-7381 Pick-to: 6.9 6.8 6.5 Reviewed-by: Simo Fält (cherry picked from commit 1126034d5b90f7dc2ea3f024d3dc15ea98712bc3) --- coin/provisioning/common/macos/p7zip.sh | 8 ++++++++ coin/provisioning/qtci-macos-10.15-x86_64/26-p7zip.sh | 8 +++----- coin/provisioning/qtci-macos-11-arm/26-p7zip.sh | 8 +++----- coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh | 8 +++----- coin/provisioning/qtci-macos-12-arm/26-p7zip.sh | 8 +++----- coin/provisioning/qtci-macos-12-x86_64/26-p7zip.sh | 8 +++----- coin/provisioning/qtci-macos-13-arm/26-p7zip.sh | 8 +++----- coin/provisioning/qtci-macos-13-x86_64/26-p7zip.sh | 8 +++----- coin/provisioning/qtci-macos-14-arm/26-p7zip.sh | 8 +++----- coin/provisioning/qtci-macos-14-x86_64/26-p7zip.sh | 8 +++----- coin/provisioning/qtci-macos-15-arm/26-p7zip.sh | 8 +++----- coin/provisioning/qtci-macos-15-x86_64/26-p7zip.sh | 8 +++----- 12 files changed, 41 insertions(+), 55 deletions(-) create mode 100755 coin/provisioning/common/macos/p7zip.sh diff --git a/coin/provisioning/common/macos/p7zip.sh b/coin/provisioning/common/macos/p7zip.sh new file mode 100755 index 00000000..ffa781f0 --- /dev/null +++ b/coin/provisioning/common/macos/p7zip.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env 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 +# Install 7z to be used from command line + +set -ex + +brew install p7zip diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-10.15-x86_64/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh" diff --git a/coin/provisioning/qtci-macos-11-arm/26-p7zip.sh b/coin/provisioning/qtci-macos-11-arm/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-11-arm/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-11-arm/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh" diff --git a/coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh" diff --git a/coin/provisioning/qtci-macos-12-arm/26-p7zip.sh b/coin/provisioning/qtci-macos-12-arm/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-12-arm/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-12-arm/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh" diff --git a/coin/provisioning/qtci-macos-12-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-12-x86_64/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh" diff --git a/coin/provisioning/qtci-macos-13-arm/26-p7zip.sh b/coin/provisioning/qtci-macos-13-arm/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-13-arm/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-13-arm/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh" diff --git a/coin/provisioning/qtci-macos-13-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-13-x86_64/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh" diff --git a/coin/provisioning/qtci-macos-14-arm/26-p7zip.sh b/coin/provisioning/qtci-macos-14-arm/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-14-arm/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-14-arm/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh" diff --git a/coin/provisioning/qtci-macos-14-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-14-x86_64/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-14-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-14-x86_64/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/26-p7zip.sh b/coin/provisioning/qtci-macos-15-arm/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-15-arm/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-15-arm/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-15-x86_64/26-p7zip.sh index 8cdcd0c3..4a6afa39 100755 --- a/coin/provisioning/qtci-macos-15-x86_64/26-p7zip.sh +++ b/coin/provisioning/qtci-macos-15-x86_64/26-p7zip.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd +#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 -# Install 7z to be used from command line - set -ex -brew update -brew install p7zip +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/p7zip.sh"