From efa98a12fd1d2289f216d3daaa81df219b3f06fb Mon Sep 17 00:00:00 2001 From: Agus Zubiaga Date: Tue, 2 Dec 2025 14:54:08 -0300 Subject: [PATCH] Pin cargo-about to 0.8.2 (#44012) cargo-about@0.8.3 doesn't seem to like our license identifiers. Pinning to 0.8.2 for now. Release Notes: - N/A --- script/generate-licenses | 8 ++++---- script/generate-licenses-csv | 8 ++++---- script/generate-licenses.ps1 | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/script/generate-licenses b/script/generate-licenses index 5deed400e4e173b4ce4bb88e4b36469cd176a9ad..6a833acd2095868b82c317e65ee37a516e41596a 100755 --- a/script/generate-licenses +++ b/script/generate-licenses @@ -2,7 +2,7 @@ set -euo pipefail -CARGO_ABOUT_VERSION="0.8" +CARGO_ABOUT_VERSION="0.8.2" OUTPUT_FILE="${1:-$(pwd)/assets/licenses.md}" TEMPLATE_FILE="script/licenses/template.md.hbs" @@ -28,10 +28,10 @@ echo -n "" >"$OUTPUT_FILE" } >>"$OUTPUT_FILE" if ! cargo about --version | grep "cargo-about $CARGO_ABOUT_VERSION" &>/dev/null; then - echo "Installing cargo-about@^$CARGO_ABOUT_VERSION..." - cargo install "cargo-about@^$CARGO_ABOUT_VERSION" + echo "Installing cargo-about@$CARGO_ABOUT_VERSION..." + cargo install "cargo-about@$CARGO_ABOUT_VERSION" else - echo "cargo-about@^$CARGO_ABOUT_VERSION is already installed." + echo "cargo-about@$CARGO_ABOUT_VERSION is already installed." fi echo "Generating cargo licenses" diff --git a/script/generate-licenses-csv b/script/generate-licenses-csv index 0e40c69d47a0d769e25fe1d45df18bdc439720d8..dd86f872d0f42d54d7387d9a43eb660849da0f14 100755 --- a/script/generate-licenses-csv +++ b/script/generate-licenses-csv @@ -2,15 +2,15 @@ set -euo pipefail -CARGO_ABOUT_VERSION="0.8" +CARGO_ABOUT_VERSION="0.8.2" OUTPUT_FILE="${1:-$(pwd)/assets/licenses.csv}" TEMPLATE_FILE="script/licenses/template.csv.hbs" if ! cargo about --version | grep "cargo-about $CARGO_ABOUT_VERSION" 2>&1 > /dev/null; then - echo "Installing cargo-about@^$CARGO_ABOUT_VERSION..." - cargo install "cargo-about@^$CARGO_ABOUT_VERSION" + echo "Installing cargo-about@$CARGO_ABOUT_VERSION..." + cargo install "cargo-about@$CARGO_ABOUT_VERSION" else - echo "cargo-about@^$CARGO_ABOUT_VERSION is already installed." + echo "cargo-about@$CARGO_ABOUT_VERSION is already installed." fi echo "Generating cargo licenses" diff --git a/script/generate-licenses.ps1 b/script/generate-licenses.ps1 index ab7df73e5696e7fbbceb236766ae35c3360a3afe..80cd249a46582e51e86870d347f922854a76a069 100644 --- a/script/generate-licenses.ps1 +++ b/script/generate-licenses.ps1 @@ -1,4 +1,4 @@ -$CARGO_ABOUT_VERSION="0.8" +$CARGO_ABOUT_VERSION="0.8.2" $outputFile=$args[0] ? $args[0] : "$(Get-Location)/assets/licenses.md" $templateFile="script/licenses/template.md.hbs" @@ -14,10 +14,10 @@ New-Item -Path "$outputFile" -ItemType File -Value "" -Force $versionOutput = cargo about --version if (-not ($versionOutput -match "cargo-about $CARGO_ABOUT_VERSION")) { - Write-Host "Installing cargo-about@^$CARGO_ABOUT_VERSION..." - cargo install "cargo-about@^$CARGO_ABOUT_VERSION" + Write-Host "Installing cargo-about@$CARGO_ABOUT_VERSION..." + cargo install "cargo-about@$CARGO_ABOUT_VERSION" } else { - Write-Host "cargo-about@^$CARGO_ABOUT_VERSION" is already installed + Write-Host "cargo-about@$CARGO_ABOUT_VERSION" is already installed } Write-Host "Generating cargo licenses"