From 098ec00e620ef3dd474ab014ebc39d4de4ee8bac Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Tue, 17 Sep 2024 13:03:45 +0200 Subject: [PATCH] Windows provisioning: Remove duplicate libusb install scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When libusb installation was added for Windows, Linux, and Mac in change 2cee9da977f4f8f0f5878839f7d150735e9bd691 there already was a libusb installation script for Windows in Coin. This script duplication has never been fixed, so we had 2 scripts for a long time. Pick-to: 6.8 Change-Id: Ic18824faf543a7cae2497b29e4ac8f757ed83af0 Reviewed-by: Tony Sarajärvi (cherry picked from commit dc29c6d1340d9bc09cd3a8667a884b9e80ec484c) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit eb3a82b7c676214e985f6fb67a33af5dd8ebdf96) --- coin/provisioning/qtci-windows-10_22H2-x86_64/90-libusb.ps1 | 1 - coin/provisioning/qtci-windows-11_23H2-aarch64/90-libusb.ps1 | 1 - coin/provisioning/qtci-windows-11_24H2-x86_64/90-libusb.ps1 | 4 ---- 3 files changed, 6 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/90-libusb.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/90-libusb.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_24H2-x86_64/90-libusb.ps1 diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/90-libusb.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/90-libusb.ps1 deleted file mode 100644 index 29a1cfa4..00000000 --- a/coin/provisioning/qtci-windows-10_22H2-x86_64/90-libusb.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/90-libusb.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-libusb.ps1 deleted file mode 100644 index 29a1cfa4..00000000 --- a/coin/provisioning/qtci-windows-11_23H2-aarch64/90-libusb.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-11_24H2-x86_64/90-libusb.ps1 b/coin/provisioning/qtci-windows-11_24H2-x86_64/90-libusb.ps1 deleted file mode 100644 index 671b9ecc..00000000 --- a/coin/provisioning/qtci-windows-11_24H2-x86_64/90-libusb.ps1 +++ /dev/null @@ -1,4 +0,0 @@ -# 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 - -. "$PSScriptRoot\..\common\windows\libusb.ps1"