root
/
buildah
mirror of https://github.com/containers/buildah.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

.cirrus: run -race only on non-PR branch 

Signed-off-by: flouthoc <flouthoc.git@gmail.com>
This commit is contained in:
flouthoc 2025-02-03 21:37:08 -08:00
parent de3c3baf09
commit 147a3ca916
No known key found for this signature in database
GPG Key ID: 15CF19F7BADBE782
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -25,7 +25,7 @@ GO_GCFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; e
NPROCS := $(shell nproc) NPROCS := $(shell nproc)
export GO_BUILD=$(GO) build export GO_BUILD=$(GO) build
export GO_TEST=$(GO) test -parallel=$(NPROCS) export GO_TEST=$(GO) test -parallel=$(NPROCS)
RACEFLAGS := $(shell $(GO_TEST) -race ./pkg/dummy > /dev/null 2>&1 && echo -race) RACEFLAGS ?= $(shell $(GO_TEST) -race ./pkg/dummy > /dev/null 2>&1 && echo -race)
COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true) COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true)
GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),${COMMIT_NO}-dirty,${COMMIT_NO}) GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),${COMMIT_NO}-dirty,${COMMIT_NO})

8
contrib/cirrus/test.sh
View File

@ -67,7 +67,13 @@ else
showrun make validate showrun make validate
;; ;;
unit) unit)
showrun make test-unit race=
if [[ -z "$CIRRUS_PR" ]]; then
# If not running on a PR then run unit tests
# with appropriate `-race` flags.
race="-race"
fi
showrun make test-unit RACEFLAGS=$race
;; ;;
conformance) conformance)
# Typically it's undesirable to install packages at runtime. # Typically it's undesirable to install packages at runtime.