Skip to content

Commit 8d383f7

Browse files
authored
improve changelog xtask (#1426)
2 parents 0547637 + 47d01e7 commit 8d383f7

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.changes/1403-1411.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
},
66
{
77
"type": "added",
8-
"description": "Added helper script `/freebsd-install-package.sh` and friends to install freebsd packages, see [wiki](https://github.com/cross-rs/cross/wiki/FAQ#custom-images)",
8+
"description": "Added helper script `/freebsd-install-package.sh` and friends to install freebsd packages, see [wiki](https://github.com/cross-rs/cross/wiki/FAQ#custom-images)"
99
}]

.github/workflows/changelog.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
files: |
2121
.changes/*.json
2222
23-
- name: Validate Changelog Files
23+
- name: Validate Changelog
2424
id: changelog
2525
run: |
2626
set -x
@@ -34,10 +34,6 @@ jobs:
3434
echo "Must add or remove changes or add the 'no changelog' label"
3535
exit 1
3636
else
37-
basenames=()
38-
for path in "${added_modified[@]}"; do
39-
basenames+=($(basename "${path}"))
40-
done
41-
cargo xtask changelog validate "${basenames[@]}"
37+
cargo xtask changelog validate
4238
fi
4339
fi

xtask/src/changelog.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ use std::path::Path;
66

77
use crate::util::{project_dir, write_to_string};
88
use cross::shell::MessageInfo;
9+
use cross::ToUtf8;
910

1011
use chrono::{Datelike, Utc};
1112
use clap::{Args, Subcommand};
12-
use cross::ToUtf8;
1313
use eyre::Context;
1414
use serde::Deserialize;
1515

@@ -516,7 +516,7 @@ pub fn validate_changelog(
516516
) -> cross::Result<()> {
517517
let root = project_dir(msg_info)?;
518518
let changes_dir = root.join(".changes");
519-
if files.is_empty() && std::env::var("GITHUB_ACTIONS").is_err() {
519+
if files.is_empty() {
520520
files = fs::read_dir(&changes_dir)?
521521
.filter_map(|x| x.ok())
522522
.filter(|x| x.file_type().map_or(false, |v| v.is_file()))

0 commit comments

Comments
 (0)