From c259d85b8ecd2cd7f8d34716c45021cf38672974 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 8 Jan 2025 17:58:25 +0100 Subject: [PATCH] Relax jq dependency from provisioning We may read the installed package information from the 'vcpkg list' command instead of parsing the vcpkg.json. Also instead of using the jq as a parser, use the cmake script. This allows skipping the jq installation. Change-Id: Id3ace62f8f40ff1bd059878da3fd13e466861830 Reviewed-by: Alexandru Croitor --- .../linux/install-vcpkg-ports-android.sh | 14 ++++-- .../common/linux/install-vcpkg-ports.sh | 18 +++++--- .../common/shared/vcpkg_parse_packages.cmake | 45 +++++++++++++++++++ .../common/windows/install-jq.ps1 | 31 ------------- .../windows/install-vcpkg-ports-android.ps1 | 11 +++-- .../common/windows/install-vcpkg-ports.ps1 | 11 +++-- .../04-install-packages.sh | 2 - .../04-install-packages.sh | 2 - .../04-install-packages.sh | 2 - .../04-install-packages.sh | 2 - .../02-zypperpackages.sh | 3 -- .../02-zypperpackages.sh | 3 -- .../qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 2 - .../qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 - .../qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 2 - .../04-zypperpackages.sh | 3 -- .../04-zypperpackages.sh | 3 -- coin/provisioning/qtci-macos-11-arm/26-jq.sh | 5 --- .../qtci-macos-11-x86_64/26-jq.sh | 5 --- coin/provisioning/qtci-macos-12-arm/26-jq.sh | 5 --- .../qtci-macos-12-x86_64/26-jq.sh | 5 --- coin/provisioning/qtci-macos-13-arm/26-jq.sh | 5 --- .../qtci-macos-13-x86_64/26-jq.sh | 5 --- coin/provisioning/qtci-macos-14-arm/26-jq.sh | 5 --- .../qtci-macos-14-x86_64/26-jq.sh | 5 --- coin/provisioning/qtci-macos-15-arm/26-jq.sh | 5 --- .../qtci-macos-15-x86_64/26-jq.sh | 5 --- .../08-install-jq.ps1 | 1 - .../08-install-jq.ps1 | 1 - .../08-install-jq.ps1 | 1 - .../08-install-jq.ps1 | 1 - .../08-install-jq.ps1 | 1 - .../08-install-jq.ps1 | 4 -- 33 files changed, 77 insertions(+), 138 deletions(-) create mode 100644 coin/provisioning/common/shared/vcpkg_parse_packages.cmake delete mode 100644 coin/provisioning/common/windows/install-jq.ps1 delete mode 100755 coin/provisioning/qtci-macos-11-arm/26-jq.sh delete mode 100755 coin/provisioning/qtci-macos-11-x86_64/26-jq.sh delete mode 100755 coin/provisioning/qtci-macos-12-arm/26-jq.sh delete mode 100755 coin/provisioning/qtci-macos-12-x86_64/26-jq.sh delete mode 100755 coin/provisioning/qtci-macos-13-arm/26-jq.sh delete mode 100755 coin/provisioning/qtci-macos-13-x86_64/26-jq.sh delete mode 100755 coin/provisioning/qtci-macos-14-arm/26-jq.sh delete mode 100755 coin/provisioning/qtci-macos-14-x86_64/26-jq.sh delete mode 100755 coin/provisioning/qtci-macos-15-arm/26-jq.sh delete mode 100755 coin/provisioning/qtci-macos-15-x86_64/26-jq.sh delete mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/08-install-jq.ps1 delete mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/08-install-jq.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_21H2-x86_64/08-install-jq.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_22H2-x86_64/08-install-jq.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/08-install-jq.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_24H2-x86_64/08-install-jq.ps1 diff --git a/coin/provisioning/common/linux/install-vcpkg-ports-android.sh b/coin/provisioning/common/linux/install-vcpkg-ports-android.sh index 4733e9aa..5e0677f8 100755 --- a/coin/provisioning/common/linux/install-vcpkg-ports-android.sh +++ b/coin/provisioning/common/linux/install-vcpkg-ports-android.sh @@ -14,9 +14,17 @@ mkdir -p "$VCPKG_ROOT/installed" cp -R x86-android-qt-tmp/* "$VCPKG_ROOT/installed/" cp -R x86_64-android-qt-tmp/* "$VCPKG_ROOT/installed/" -versions=$(jq -r '.overrides[] | "vcpkg \(.name) for android = \(.version)"' vcpkg.json) -versions="${versions//vcpkg/\\nvcpkg}" -echo "$versions" >> ~/versions.txt +cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\ + "-DVCPKG_INSTALL_ROOT=$PWD/x86-android-qt-tmp"\ + "-DOUTPUT=~/versions.txt"\ + -P\ + "${BASH_SOURCE%/*}/../shared/vcpkg_parse_packages.cmake" + +cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\ + "-DVCPKG_INSTALL_ROOT=$PWD/x86_64-android-qt-tmp"\ + "-DOUTPUT=$HOME/versions.txt"\ + -P\ + "${BASH_SOURCE%/*}/../shared/vcpkg_parse_packages.cmake" rm -rf x86-android-qt-tmp rm -rf x86_64-android-qt-tmp diff --git a/coin/provisioning/common/linux/install-vcpkg-ports.sh b/coin/provisioning/common/linux/install-vcpkg-ports.sh index 90257841..dec6ad28 100755 --- a/coin/provisioning/common/linux/install-vcpkg-ports.sh +++ b/coin/provisioning/common/linux/install-vcpkg-ports.sh @@ -7,15 +7,19 @@ echo "Installing vcpkg ports" pushd "${BASH_SOURCE%/*}/vcpkg" || exit cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" . -"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root x64-linux-qt-tmp --debug +install_root=x64-linux-qt-tmp + +"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root $install_root --debug + +cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\ + "-DVCPKG_INSTALL_ROOT=$PWD/$install_root"\ + "-DOUTPUT=$HOME/versions.txt"\ + -P\ + "${BASH_SOURCE%/*}/../shared/vcpkg_parse_packages.cmake" mkdir -p "$VCPKG_ROOT/installed" -cp -R x64-linux-qt-tmp/* "$VCPKG_ROOT/installed/" +cp -R $install_root/* "$VCPKG_ROOT/installed/" -versions=$(jq -r '.overrides[] | "vcpkg \(.name) = \(.version)"' vcpkg.json) -versions="${versions//vcpkg/\\nvcpkg}" -echo "$versions" >> ~/versions.txt - -rm -rf x64-linux-qt-tmp +rm -rf $install_root popd || exit diff --git a/coin/provisioning/common/shared/vcpkg_parse_packages.cmake b/coin/provisioning/common/shared/vcpkg_parse_packages.cmake new file mode 100644 index 00000000..98508cd1 --- /dev/null +++ b/coin/provisioning/common/shared/vcpkg_parse_packages.cmake @@ -0,0 +1,45 @@ +#!/usr/bin/cmake -P + +cmake_minimum_required(VERSION 3.19) + +message("VCPKG_EXECUTABLE: ${VCPKG_EXECUTABLE}") +if(NOT VCPKG_EXECUTABLE OR NOT EXISTS "${VCPKG_EXECUTABLE}" OR NOT OUTPUT OR NOT VCPKG_INSTALL_ROOT) + message(FATAL_ERROR "Usage: \ncmake -DVCPKG_EXECUTABLE=" + " -DOUTPUT= -DVCPKG_INSTALL_ROOT=" + " -P vcpkg_parse_packages.cmake" + ) +endif() +execute_process(COMMAND "${VCPKG_EXECUTABLE}" + "list" "--x-install-root=${VCPKG_INSTALL_ROOT}" "--x-json" OUTPUT_VARIABLE result) + +string(JSON element_count LENGTH "${result}") + +file(STRINGS "${OUTPUT}" output_data) +math(EXPR last_index "${element_count} - 1") +foreach(i RANGE 0 ${last_index}) + string(JSON package MEMBER "${result}" "${i}") + + # Extract the package name from : pair + if(NOT package MATCHES "^([^:]+):.+$") + continue() + endif() + + # Skip vcpkg internal tools + set(package_name "${CMAKE_MATCH_1}") + if(package_name MATCHES "^vcpkg-.+$") + continue() + endif() + + string(JSON package_info GET "${result}" "${package}") + string(JSON version GET "${package_info}" "version") + + string(STRIP "${package}" package) + string(STRIP "${version}" version) + # Store the package information for the particular triplet + list(APPEND output_data "vcpkg ${package} = ${version}") +endforeach() + +if(output_data) + list(JOIN output_data "\n" output_data) + file(WRITE "${OUTPUT}" "${output_data}\n") +endif() diff --git a/coin/provisioning/common/windows/install-jq.ps1 b/coin/provisioning/common/windows/install-jq.ps1 deleted file mode 100644 index 6f5bd333..00000000 --- a/coin/provisioning/common/windows/install-jq.ps1 +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2019 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\helpers.ps1" - -# This script installs jq - -$jqProgram = "jq" -$jqVersion = "1.6" -$jqExeSHA1 = "2b7ae7b902aa251b55f2fd73ad5b067d2215ce78" -$jqInstallLocation = "C:\Utils\jq" -$jqExe = "C:\Windows\Temp\jq.exe" -$jqCacheURL = "\\ci-files01-hki.ci.qt.io\provisioning\jq\jq-win64-$jqVersion.exe" -$jqOfficialURL = "https://github.com/jqlang/jq/releases/download/jq-$jqVersion/jq-win64.exe" - -Download "$jqOfficialURL" "$jqCacheURL" "$jqExe" -Verify-Checksum $jqExe $jqExeSHA1 -New-Item -Path "C:\Utils" -Name "jq" -ItemType "directory" -Force -Move-Item -Path "$jqExe" -Destination "$jqInstallLocation" -Force - -if(![System.IO.File]::Exists("$jqInstallLocation\jq.exe")){ - Write-Host "Can't find $jqInstallLocation\jq.exe." - exit 1 -} - -# Add jq to Path. It is necessary to prepend it to $env:Path as well, to make -# it available during provisioning -Prepend-Path "$jqInstallLocation" -$env:Path = "$jqInstallLocation;$env:Path" - -Write-Output "jq = $jqVersion" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-vcpkg-ports-android.ps1 b/coin/provisioning/common/windows/install-vcpkg-ports-android.ps1 index 646f36cd..1f4656e2 100644 --- a/coin/provisioning/common/windows/install-vcpkg-ports-android.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg-ports-android.ps1 @@ -5,19 +5,18 @@ Write-Host "Installing vcpkg android ports" $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe" $vcpkgRoot = "$env:VCPKG_ROOT" +$vcpkgInstallRoot = "armeabi-v7a-android-qt-tmp" Set-Location -Path "$PSScriptRoot\vcpkg" Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg" -Run-Executable "$vcpkgExe" "install --triplet armeabi-v7a-android-qt --x-install-root armeabi-v7a-android-qt-tmp --debug" +Run-Executable "$vcpkgExe" "install --triplet armeabi-v7a-android-qt --x-install-root $vcpkgInstallRoot --debug" New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force -Copy-Item -Path "armeabi-v7a-android-qt-tmp\*" -Destination "$vcpkgRoot\installed" -Recurse -Force +Copy-Item -Path "$vcpkgInstallRoot\*" -Destination "$vcpkgRoot\installed" -Recurse -Force -$versions = jq.exe -r '.overrides[] | \"vcpkg \(.name) for android = \(.version)\"' vcpkg.json -$versions = $versions.Replace("vcpkg", "`nvcpkg") -Write-Output "$versions" >> ~/versions.txt +Run-Executable "cmake" "-DVCPKG_EXECUTABLE=$vcpkgExe -DVCPKG_INSTALL_ROOT=$vcpkgInstallRoot -DOUTPUT=$env:USERPROFILE\versions.txt -P $PSScriptRoot\..\shared\vcpkg_parse_packages.cmake" -Remove-Item -Path "armeabi-v7a-android-qt-tmp" -Recurse -Force +Remove-Item -Path "$vcpkgInstallRoot" -Recurse -Force Set-Location "$PSScriptRoot" diff --git a/coin/provisioning/common/windows/install-vcpkg-ports.ps1 b/coin/provisioning/common/windows/install-vcpkg-ports.ps1 index 2b73502c..34198ee6 100644 --- a/coin/provisioning/common/windows/install-vcpkg-ports.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg-ports.ps1 @@ -8,19 +8,18 @@ param([string]$arch="x64") Write-Host "Installing vcpkg ports" $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe" $vcpkgRoot = "$env:VCPKG_ROOT" +$vcpkgInstallRoot = "$arch-windows-qt-tmp" Set-Location -Path "$PSScriptRoot\vcpkg" Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg" -Run-Executable "$vcpkgExe" "install --triplet $arch-windows-qt --x-install-root $arch-windows-qt-tmp --debug" +Run-Executable "$vcpkgExe" "install --triplet $arch-windows-qt --x-install-root $vcpkginstallroot --debug" New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force -Copy-Item -Path "$arch-windows-qt-tmp\*" -Destination "$vcpkgRoot\installed" -Recurse -Force +Copy-Item -Path "$vcpkginstallroot\*" -Destination "$vcpkgRoot\installed" -Recurse -Force -$versions = jq.exe -r '.overrides[] | \"vcpkg \(.name) = \(.version)\"' vcpkg.json -$versions = $versions.Replace("vcpkg", "`nvcpkg") -Write-Output "$versions" >> ~/versions.txt +Run-Executable "cmake" "-DVCPKG_EXECUTABLE=$vcpkgExe -DVCPKG_INSTALL_ROOT=$vcpkgInstallRoot -DOUTPUT=$env:USERPROFILE\versions.txt -P $PSScriptRoot\..\shared\vcpkg_parse_packages.cmake" -Remove-Item -Path "$arch-windows-qt-tmp" -Recurse -Force +Remove-Item -Path "$vcpkginstallroot" -Recurse -Force Set-Location "$PSScriptRoot" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh index f2c71ec6..91a46101 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh @@ -147,8 +147,6 @@ installPackages+=(open-vm-tools) # cifs-utils, for mounting smb drive installPackages+=(keyutils) installPackages+=(cifs-utils) -# used for reading vcpkg packages version, from vcpkg.json -installPackages+=(jq) # zip, needed for vcpkg caching installPackages+=(zip) # OpenSSL requirement, built by vcpkg diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 161a4adb..ebe73200 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -148,8 +148,6 @@ installPackages+=(open-vm-tools) # cifs-utils, for mounting smb drive installPackages+=(keyutils) installPackages+=(cifs-utils) -# used for reading vcpkg packages version, from vcpkg.json -installPackages+=(jq) # zip, needed for vcpkg caching installPackages+=(zip) # OpenSSL requirement, built by vcpkg diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index fbe3b480..56d505e9 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -159,8 +159,6 @@ installPackages+=(nfs-utils) # cifs-utils, for mounting smb drive installPackages+=(keyutils) installPackages+=(cifs-utils) -# used for reading vcpkg packages version, from vcpkg.json -installPackages+=(jq) # zip, needed for vcpkg caching installPackages+=(zip) # OpenSSL requirement, built by vcpkg diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh index db579884..71358847 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh @@ -159,8 +159,6 @@ installPackages+=(nfs-utils) # cifs-utils, for mounting smb drive installPackages+=(keyutils) installPackages+=(cifs-utils) -# used for reading vcpkg packages version, from vcpkg.json -installPackages+=(jq) # zip, needed for vcpkg caching installPackages+=(zip) # OpenSSL requirement, built by vcpkg diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh index c6d687a8..44481212 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh @@ -92,9 +92,6 @@ sudo zypper -nq update open-vm-tools # Tools to build Git sudo zypper -nq install autoconf libcurl-devel libexpat-devel -# used for reading vcpkg packages version, from vcpkg.json -sudo zypper -nq install jq - # zip, needed for vcpkg caching sudo zypper -nq install zip diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh index 5611a8bc..2db9e074 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh @@ -94,9 +94,6 @@ sudo zypper -nq update open-vm-tools # Tools to build Git sudo zypper -nq install autoconf libcurl-devel libexpat-devel -# used for reading vcpkg packages version, from vcpkg.json -sudo zypper -nq install jq - # zip, needed for vcpkg caching sudo zypper -nq install zip diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh index 9696efc2..35acaa3a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh @@ -233,8 +233,6 @@ installPackages+=(keyutils) installPackages+=(cifs-utils) # VxWorks QEMU network setup (tunctl) installPackages+=(uml-utilities) -# used for reading vcpkg packages version, from vcpkg.json -installPackages+=(jq) # To save iptables rules installPackages+=(iptables-persistent) diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh index 84cebda4..a177367d 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh @@ -225,8 +225,6 @@ installPackages+=(keyutils) installPackages+=(cifs-utils) # VxWorks QEMU network setup (tunctl) installPackages+=(uml-utilities) -# used for reading vcpkg packages version, from vcpkg.json -installPackages+=(jq) # For building installPackages+=(cmake) # extra linkers diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh index 98a541a9..e5b70c72 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh @@ -244,8 +244,6 @@ installPackages+=(keyutils) installPackages+=(cifs-utils) # VxWorks QEMU network setup (tunctl) installPackages+=(uml-utilities) -# used for reading vcpkg packages version, from vcpkg.json -installPackages+=(jq) installPackages+=(patchelf) diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh index 69f3b420..545419c3 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh @@ -76,9 +76,6 @@ sudo zypper -nq install zip # OpenSSL 3 sudo zypper -nq install openssl-3 -# used for reading vcpkg packages version, from vcpkg.json -sudo zypper -nq install jq - # Valgrind (Needed for testlib selftests) sudo zypper -nq install valgrind-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh index e3c5cf9e..178c1d68 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh @@ -72,9 +72,6 @@ sudo zypper -nq install zip # OpenSSL 3 sudo zypper -nq install openssl-3 -# used for reading vcpkg packages version, from vcpkg.json -sudo zypper -nq install jq - # Valgrind (Needed for testlib selftests) sudo zypper -nq install valgrind-devel diff --git a/coin/provisioning/qtci-macos-11-arm/26-jq.sh b/coin/provisioning/qtci-macos-11-arm/26-jq.sh deleted file mode 100755 index 4dffcb96..00000000 --- a/coin/provisioning/qtci-macos-11-arm/26-jq.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install jq diff --git a/coin/provisioning/qtci-macos-11-x86_64/26-jq.sh b/coin/provisioning/qtci-macos-11-x86_64/26-jq.sh deleted file mode 100755 index 4dffcb96..00000000 --- a/coin/provisioning/qtci-macos-11-x86_64/26-jq.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install jq diff --git a/coin/provisioning/qtci-macos-12-arm/26-jq.sh b/coin/provisioning/qtci-macos-12-arm/26-jq.sh deleted file mode 100755 index 4dffcb96..00000000 --- a/coin/provisioning/qtci-macos-12-arm/26-jq.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install jq diff --git a/coin/provisioning/qtci-macos-12-x86_64/26-jq.sh b/coin/provisioning/qtci-macos-12-x86_64/26-jq.sh deleted file mode 100755 index 4dffcb96..00000000 --- a/coin/provisioning/qtci-macos-12-x86_64/26-jq.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install jq diff --git a/coin/provisioning/qtci-macos-13-arm/26-jq.sh b/coin/provisioning/qtci-macos-13-arm/26-jq.sh deleted file mode 100755 index 4dffcb96..00000000 --- a/coin/provisioning/qtci-macos-13-arm/26-jq.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install jq diff --git a/coin/provisioning/qtci-macos-13-x86_64/26-jq.sh b/coin/provisioning/qtci-macos-13-x86_64/26-jq.sh deleted file mode 100755 index 4dffcb96..00000000 --- a/coin/provisioning/qtci-macos-13-x86_64/26-jq.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install jq diff --git a/coin/provisioning/qtci-macos-14-arm/26-jq.sh b/coin/provisioning/qtci-macos-14-arm/26-jq.sh deleted file mode 100755 index 4dffcb96..00000000 --- a/coin/provisioning/qtci-macos-14-arm/26-jq.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install jq diff --git a/coin/provisioning/qtci-macos-14-x86_64/26-jq.sh b/coin/provisioning/qtci-macos-14-x86_64/26-jq.sh deleted file mode 100755 index 4dffcb96..00000000 --- a/coin/provisioning/qtci-macos-14-x86_64/26-jq.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install jq diff --git a/coin/provisioning/qtci-macos-15-arm/26-jq.sh b/coin/provisioning/qtci-macos-15-arm/26-jq.sh deleted file mode 100755 index 4dffcb96..00000000 --- a/coin/provisioning/qtci-macos-15-arm/26-jq.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install jq diff --git a/coin/provisioning/qtci-macos-15-x86_64/26-jq.sh b/coin/provisioning/qtci-macos-15-x86_64/26-jq.sh deleted file mode 100755 index 4dffcb96..00000000 --- a/coin/provisioning/qtci-macos-15-x86_64/26-jq.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -brew install jq diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/08-install-jq.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/08-install-jq.ps1 deleted file mode 100644 index 18fa568a..00000000 --- a/coin/provisioning/qtci-windows-10_21H2-x86_64/08-install-jq.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-jq.ps1" diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/08-install-jq.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/08-install-jq.ps1 deleted file mode 100644 index 18fa568a..00000000 --- a/coin/provisioning/qtci-windows-10_22H2-x86_64/08-install-jq.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-jq.ps1" diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/08-install-jq.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/08-install-jq.ps1 deleted file mode 100644 index 18fa568a..00000000 --- a/coin/provisioning/qtci-windows-11_21H2-x86_64/08-install-jq.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-jq.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/08-install-jq.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/08-install-jq.ps1 deleted file mode 100644 index 18fa568a..00000000 --- a/coin/provisioning/qtci-windows-11_22H2-x86_64/08-install-jq.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-jq.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/08-install-jq.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/08-install-jq.ps1 deleted file mode 100644 index 18fa568a..00000000 --- a/coin/provisioning/qtci-windows-11_23H2-x86_64/08-install-jq.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-jq.ps1" diff --git a/coin/provisioning/qtci-windows-11_24H2-x86_64/08-install-jq.ps1 b/coin/provisioning/qtci-windows-11_24H2-x86_64/08-install-jq.ps1 deleted file mode 100644 index 8804120f..00000000 --- a/coin/provisioning/qtci-windows-11_24H2-x86_64/08-install-jq.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\install-jq.ps1"