diff --git a/Makefile b/Makefile index e7066ba..34bb53f 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 diff --git a/e2e/tests/edge.sh b/e2e/tests/edge.sh index 415ef96..40c1718 100644 --- a/e2e/tests/edge.sh +++ b/e2e/tests/edge.sh @@ -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"