Skip to content

Commit bfa28bc

Browse files
committed
chore: Regenerate THIRD-PARTY-LICENSES for the openjd-* 0.6.0 bump
`scripts/check_third_party_licenses.sh` fails on a Cargo.lock change alone, and the three crate bumps are exactly what the diff contains: openjd-expr 0.5.0 -> 0.6.0, openjd-model 0.5.4 -> 0.6.0, openjd-sessions 0.5.4 -> 0.5.5. No other line moves, and no transitive dependency changed. Regenerating it needed a portability fix first. `sed -i 's/\r//'` on the EOL normalization line is GNU-only: BSD sed reads the next argument as the backup suffix, so on macOS the script died with `sed: 1: "/var/folders/...": invalid command code f` before writing anything. Rewriting through a temp file behaves identically on both. The failure was not specific to this change -- the script could not be run on macOS at all -- and CI regenerates with the same script, so the committed file and the check stay in agreement. Verified: `scripts/check_third_party_licenses.sh --update` then `scripts/check_third_party_licenses.sh` reports the file up to date, with cargo-about 0.9.2, the version CI installs. Signed-off-by: David Leong <116610336+leongdl@users.noreply.github.com>
1 parent e5b9b2c commit bfa28bc

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

‎THIRD-PARTY-LICENSES.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2534,9 +2534,9 @@ limitations under the License.
25342534
** itoa; version 1.0.18 -- https://crates.io/crates/itoa
25352535
** libc; version 0.2.189 -- https://crates.io/crates/libc
25362536
** manyhow-macros; version 0.11.4 -- https://crates.io/crates/manyhow-macros
2537-
** openjd-expr; version 0.5.0 -- https://crates.io/crates/openjd-expr
2538-
** openjd-model; version 0.5.4 -- https://crates.io/crates/openjd-model
2539-
** openjd-sessions; version 0.5.4 -- https://crates.io/crates/openjd-sessions
2537+
** openjd-expr; version 0.6.0 -- https://crates.io/crates/openjd-expr
2538+
** openjd-model; version 0.6.0 -- https://crates.io/crates/openjd-model
2539+
** openjd-sessions; version 0.5.5 -- https://crates.io/crates/openjd-sessions
25402540
** pin-project-lite; version 0.2.17 -- https://crates.io/crates/pin-project-lite
25412541
** portable-atomic; version 1.15.0 -- https://crates.io/crates/portable-atomic
25422542
** proc-macro2; version 1.0.107 -- https://crates.io/crates/proc-macro2

‎scripts/check_third_party_licenses.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,9 @@ awk -v re="^[*][*] ($workspace_pattern); version " '
158158
cat "$rust_section"
159159
} > "$generated"
160160

161-
# Ensure consistent EOL.
162-
sed -i 's/\r//' "$generated"
161+
# Ensure consistent EOL. Rewritten through a temp file rather than `sed -i`,
162+
# which needs a backup suffix on BSD sed and rejects one on GNU sed.
163+
sed 's/\r//' "$generated" > "$generated.eol" && mv "$generated.eol" "$generated"
163164

164165
if [[ "$mode" == "update" ]]; then
165166
cp "$generated" "$OUTPUT_FILE"

0 commit comments

Comments
 (0)