Skip to content
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.

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

shfmt: update to 3.5.1. #36617

Merged
merged 1 commit into from May 31, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions srcpkgs/shfmt/template
@@ -1,6 +1,6 @@
# Template file for 'shfmt'
pkgname=shfmt
version=3.4.2
version=3.5.1
revision=1
wrksrc="sh-${version}"
build_style=go
Expand All @@ -14,10 +14,14 @@ license="BSD-3-Clause"
homepage="https://github.com/mvdan/sh"
changelog="https://raw.githubusercontent.com/mvdan/sh/master/CHANGELOG.md"
distfiles="https://github.com/mvdan/sh/archive/v${version}.tar.gz"
checksum=2000656613bc4165fb1d419bedec08fcb23a625274f4505e303d18b204d8f5ee
checksum=f15ca9952ef6dc4c1051550152768a99dde0d3f72269d0510f75522a492270cf

post_install() {
scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1
vman shfmt.1
vlicense LICENSE
}

do_check() {
go test ./...
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tests fail for me locally

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, weird, works fine both locally and on the CI. Shall I remove it?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in a fresh hostdir:

=> shfmt-3.5.1_1: running do_check ...
go: downloading github.com/rogpeppe/go-internal v1.8.1
go: downloading golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
go: downloading github.com/creack/pty v1.1.17
go: downloading github.com/frankban/quicktest v1.14.0
 go: downloading github.com/google/go-cmp v0.5.6
go: downloading gopkg.in/errgo.v2 v2.1.0
go: downloading github.com/kr/pretty v0.3.0
go: downloading github.com/kr/text v0.2.0
# mvdan.cc/sh/v3/shell.test
loadelf: $WORK/b089/_pkg_.a(_x001.o): 129398: sym#52 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x002.o): 129402: sym#52 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x003.o): 129411: sym#70 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x004.o): 129417: sym#57 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x001.o): 129421: sym#50 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x002.o): 129425: sym#27 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x003.o): 129430: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x004.o): 129437: sym#65 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x005.o): 129448: sym#82 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x006.o): 129458: sym#97 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x007.o): 129463: sym#68 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x008.o): 129468: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x009.o): 129473: sym#83 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x010.o): 129478: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x011.o): 129486: sym#67 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x012.o): 129491: sym#75 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
_cgo_callers: relocation target x_cgo_callers not defined
_cgo_init: relocation target x_cgo_init not defined
_cgo_mmap: relocation target x_cgo_mmap not defined
_cgo_munmap: relocation target x_cgo_munmap not defined
_cgo_notify_runtime_init_done: relocation target x_cgo_notify_runtime_init_done not defined
/usr/lib/go/pkg/tool/linux_amd64/link: too many errors
# mvdan.cc/sh/v3/expand.test
loadelf: $WORK/b089/_pkg_.a(_x001.o): 129429: sym#52 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x002.o): 129433: sym#52 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x003.o): 129442: sym#70 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x004.o): 129448: sym#57 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x001.o): 129452: sym#50 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x002.o): 129456: sym#27 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x003.o): 129461: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x004.o): 129468: sym#65 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x005.o): 129479: sym#82 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x006.o): 129489: sym#97 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x007.o): 129494: sym#68 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x008.o): 129499: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x009.o): 129504: sym#83 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x010.o): 129509: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x011.o): 129517: sym#67 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x012.o): 129522: sym#75 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
_cgo_callers: relocation target x_cgo_callers not defined
_cgo_init: relocation target x_cgo_init not defined
_cgo_mmap: relocation target x_cgo_mmap not defined
_cgo_munmap: relocation target x_cgo_munmap not defined
_cgo_notify_runtime_init_done: relocation target x_cgo_notify_runtime_init_done not defined
/usr/lib/go/pkg/tool/linux_amd64/link: too many errors
# mvdan.cc/sh/v3/cmd/gosh.test
loadelf: $WORK/b089/_pkg_.a(_x001.o): 139926: sym#52 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x002.o): 139930: sym#52 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x003.o): 139939: sym#70 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x004.o): 139945: sym#57 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x001.o): 139949: sym#50 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x002.o): 139953: sym#27 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x003.o): 139958: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x004.o): 139965: sym#65 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x005.o): 139976: sym#82 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x006.o): 139986: sym#97 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x007.o): 139991: sym#68 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x008.o): 139996: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x009.o): 140001: sym#83 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x010.o): 140006: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x011.o): 140014: sym#67 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x012.o): 140019: sym#75 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
_cgo_callers: relocation target x_cgo_callers not defined
_cgo_init: relocation target x_cgo_init not defined
_cgo_mmap: relocation target x_cgo_mmap not defined
_cgo_munmap: relocation target x_cgo_munmap not defined
_cgo_notify_runtime_init_done: relocation target x_cgo_notify_runtime_init_done not defined
/usr/lib/go/pkg/tool/linux_amd64/link: too many errors
FAIL	mvdan.cc/sh/v3/cmd/gosh [build failed]
ok  	mvdan.cc/sh/v3/cmd/shfmt	1.402s
FAIL	mvdan.cc/sh/v3/expand [build failed]
?   	mvdan.cc/sh/v3/fileutil	[no test files]
# mvdan.cc/sh/v3/interp.test
loadelf: $WORK/b089/_pkg_.a(_x001.o): 143163: sym#52 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x002.o): 143167: sym#52 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x003.o): 143176: sym#70 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b089/_pkg_.a(_x004.o): 143182: sym#57 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x001.o): 143186: sym#50 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x002.o): 143190: sym#27 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x003.o): 143195: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x004.o): 143202: sym#65 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x005.o): 143213: sym#82 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x006.o): 143223: sym#97 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x007.o): 143228: sym#68 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x008.o): 143233: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x009.o): 143238: sym#83 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x010.o): 143243: sym#64 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x011.o): 143251: sym#67 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
loadelf: $WORK/b090/_pkg_.a(_x012.o): 143256: sym#75 (wm4.0.fc9c9d2fb651cef3b6c70ac97a70a303): ignoring symbol in section 1 (type 0)
_cgo_callers: relocation target x_cgo_callers not defined
_cgo_init: relocation target x_cgo_init not defined
_cgo_mmap: relocation target x_cgo_mmap not defined
_cgo_munmap: relocation target x_cgo_munmap not defined
_cgo_notify_runtime_init_done: relocation target x_cgo_notify_runtime_init_done not defined
/usr/lib/go/pkg/tool/linux_amd64/link: too many errors
FAIL	mvdan.cc/sh/v3/interp [build failed]
ok  	mvdan.cc/sh/v3/pattern	0.008s
FAIL	mvdan.cc/sh/v3/shell [build failed]
ok  	mvdan.cc/sh/v3/syntax	3.761s
FAIL
=> ERROR: shfmt-3.5.1_1: do_check: 'go test ./...' exited with 2
=> ERROR:   in do_check() at srcpkgs/shfmt/template:26

}