Skip to content

support severity levels in xlint #48680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
classabbyamp wants to merge 5 commits into from
Closed

support severity levels in xlint #48680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ff1feb
common/scripts/lint2annotations.awk: support severity in xlint
classabbyamp Feb 12, 2024
312e001
common/travis/xlint.sh: support xlint severity levels
classabbyamp Feb 12, 2024
6433519
temp
classabbyamp Feb 12, 2024
3e48b9f
temp
classabbyamp Feb 12, 2024
8fc5c0d
fixup! temp
classabbyamp Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions common/scripts/lint2annotations.awk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
split($0, a, ": ")
split(a[1], b, ":")
msg = substr($0, index($0, ": ") + 2)
if (b[2]) {
severity = "error"
if (b[3]) {
line = ",line=" b[3]
severity = b[2]
} else if (b[2]) {
line = ",line=" b[2]
}
printf "::error title=Template Lint,file=%s%s::%s\n", b[1], line, msg
printf "::%s title=Template Lint,file=%s%s::%s\n", severity, b[1], line, msg
}
2 changes: 1 addition & 1 deletion common/travis/fetch-xtools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

TAR=tar
command -v bsdtar >/dev/null && TAR=bsdtar
URL="https://github.com/leahneukirchen/xtools/archive/master.tar.gz"
URL="https://github.com/classabbyamp/xtools/archive/sev0.tar.gz"
FILE="xtools.tar.gz"

mkdir -p /tmp/bin
Expand Down
2 changes: 2 additions & 0 deletions common/travis/xlint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ common/scripts/lint-commits $base $tip || EXITCODE=$?
for t in $(awk '{ print "srcpkgs/" $0 "/template" }' /tmp/templates); do
/bin/echo -e "\x1b[32mLinting $t...\x1b[0m"
xlint "$t" > /tmp/xlint_out || EXITCODE=$?
# if there are only warnings, don't consider it a fail
grep -q error /tmp/xlint_out || EXITCODE=0
common/scripts/lint-version-change "$t" $base $tip > /tmp/vlint_out || EXITCODE=$?
awk -f common/scripts/lint2annotations.awk /tmp/xlint_out /tmp/vlint_out
done
Expand Down
5 changes: 3 additions & 2 deletions srcpkgs/chezmoi/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'chezmoi'
pkgname=chezmoi
version=2.46.0
version=2.46.1
revision=1
build_style=go
go_import_path="github.com/twpayne/chezmoi/v2"
Expand All @@ -13,7 +13,8 @@ license="MIT"
homepage="https://chezmoi.io/"
changelog="https://github.com/twpayne/chezmoi/releases"
distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
checksum=36cee8fc5579a155d4f5402f353e4b4099f92ec2b98982a4ccff4ab35f4d0348
checksum=5b6b908da4a374d9fcad07b1f5002e50f3d5a8fdda2eb5f471befdcf365f67e4
_foo_bar=

pre_build() {
local _date
Expand Down