Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BINARY = vifal
GOLANGCI_LINT_VERSION = v2.11.4
GO_LICENSES_VERSION = v1.6.0
GOLANGCI_LINT_VERSION = v2.12.1
GO_LICENSES_VERSION = v2.0.1
GO_BUILD_FLAGS ?=
GO_LDFLAGS ?= -s -w
TIMEOUT_CMD = timeout --foreground
Expand Down Expand Up @@ -46,7 +46,7 @@ shellcheck:

# If this fails, run: go-licenses save ./... --save_path=LICENSES --ignore github.com/machine424/vifal
licenses-check:
go install github.com/google/go-licenses@$(GO_LICENSES_VERSION)
go install github.com/google/go-licenses/v2@$(GO_LICENSES_VERSION)
go-licenses check ./...
rm -rf LICENSES.tmp
go-licenses save ./... --save_path=LICENSES.tmp --ignore github.com/machine424/vifal
Expand Down
7 changes: 5 additions & 2 deletions e2e/tests/edge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,14 @@ content=$(fuse cat "$NGINX_FS/proc/version")
kversion=$(kexec cat /proc/version)
[ "$content" = "$kversion" ]

# Capture first to avoid SIGPIPE with pipefail.
log_step "procfs cpuinfo is readable and non-empty"
fuse cat "$NGINX_FS/proc/cpuinfo" | grep -qi "processor\|bogomips\|model"
content=$(fuse cat "$NGINX_FS/proc/cpuinfo")
echo "$content" | grep -qi "processor\|bogomips\|model"

log_step "procfs meminfo is readable and non-empty"
fuse cat "$NGINX_FS/proc/meminfo" | grep -qi "memtotal\|memfree"
content=$(fuse cat "$NGINX_FS/proc/meminfo")
echo "$content" | grep -qi "memtotal\|memfree"

log_step "file that grew since last stat returns new content"
GROW="$NGINX_FS/tmp/grow-test"
Expand Down
Loading