Make script/generate-license
fail on WARN too (#34008)
Current main shows this on `script/generate-licenses`: ``` [WARN] failed to validate all files specified in clarification for crate ring 0.17.14: checksum mismatch, expected '76b39f9b371688eac9d8323f96ee80b3aef5ecbc2217f25377bd4e4a615296a9' ``` Ring fixed it's licenses ambiguity upstream. This warning was identifying that their license text (multiple licenses concatenated) had changed (sha mismatch) and thus our license clarification was invalid. Tested the script to confirm this [now fails](https://github.com/zed-industries/zed/actions/runs/16118890720/job/45479355992?pr=34008) under CI and then removed the ring clarification because it is no longer required and now passes. Release Notes: - N/A
This commit is contained in:
parent
38febed02d
commit
2a6ef006f4
3 changed files with 11 additions and 8 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -65,7 +65,7 @@ jobs:
|
||||||
else
|
else
|
||||||
echo "run_docs=false" >> $GITHUB_OUTPUT
|
echo "run_docs=false" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep '^Cargo.lock') ]]; then
|
if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep -P '^(Cargo.lock|script/.*licenses)') ]]; then
|
||||||
echo "run_license=true" >> $GITHUB_OUTPUT
|
echo "run_license=true" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
echo "run_license=false" >> $GITHUB_OUTPUT
|
echo "run_license=false" >> $GITHUB_OUTPUT
|
||||||
|
|
|
@ -6,6 +6,15 @@ CARGO_ABOUT_VERSION="0.7"
|
||||||
OUTPUT_FILE="${1:-$(pwd)/assets/licenses.md}"
|
OUTPUT_FILE="${1:-$(pwd)/assets/licenses.md}"
|
||||||
TEMPLATE_FILE="script/licenses/template.md.hbs"
|
TEMPLATE_FILE="script/licenses/template.md.hbs"
|
||||||
|
|
||||||
|
fail_on_stderr() {
|
||||||
|
local tmpfile=$(mktemp)
|
||||||
|
"$@" 2> >(tee "$tmpfile" >&2)
|
||||||
|
local rc=$?
|
||||||
|
[ -s "$tmpfile" ] && rc=1
|
||||||
|
rm "$tmpfile"
|
||||||
|
return $rc
|
||||||
|
}
|
||||||
|
|
||||||
echo -n "" >"$OUTPUT_FILE"
|
echo -n "" >"$OUTPUT_FILE"
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -28,7 +37,7 @@ fi
|
||||||
echo "Generating cargo licenses"
|
echo "Generating cargo licenses"
|
||||||
if [ -z "${ALLOW_MISSING_LICENSES-}" ]; then FAIL_FLAG=--fail; else FAIL_FLAG=""; fi
|
if [ -z "${ALLOW_MISSING_LICENSES-}" ]; then FAIL_FLAG=--fail; else FAIL_FLAG=""; fi
|
||||||
set -x
|
set -x
|
||||||
cargo about generate \
|
fail_on_stderr cargo about generate \
|
||||||
$FAIL_FLAG \
|
$FAIL_FLAG \
|
||||||
-c script/licenses/zed-licenses.toml \
|
-c script/licenses/zed-licenses.toml \
|
||||||
"$TEMPLATE_FILE" >>"$OUTPUT_FILE"
|
"$TEMPLATE_FILE" >>"$OUTPUT_FILE"
|
||||||
|
|
|
@ -177,9 +177,3 @@ license = "MIT"
|
||||||
[[pet-windows-store.clarify.files]]
|
[[pet-windows-store.clarify.files]]
|
||||||
path = '../../LICENSE'
|
path = '../../LICENSE'
|
||||||
checksum = 'c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383'
|
checksum = 'c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383'
|
||||||
|
|
||||||
[ring.clarify]
|
|
||||||
license = "ISC AND OpenSSL"
|
|
||||||
[[ring.clarify.files]]
|
|
||||||
path = 'LICENSE'
|
|
||||||
checksum = '76b39f9b371688eac9d8323f96ee80b3aef5ecbc2217f25377bd4e4a615296a9'
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue