Skip to content

Commit 989575c

Browse files
authored
chore: prevent commit signing in tests (coder#13222)
1 parent 4671ebb commit 989575c

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ GO_SRC_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.go' -not -nam
5656
# All the shell files in the repo, excluding ignored files.
5757
SHELL_SRC_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.sh')
5858

59+
# Ensure we don't use the user's git configs which might cause side-effects
60+
GIT_FLAGS = GIT_CONFIG_GLOBAL=/dev/null GIT_CONFIG_SYSTEM=/dev/null
61+
5962
# All ${OS}_${ARCH} combos we build for. Windows binaries have the .exe suffix.
6063
OS_ARCHES := \
6164
linux_amd64 linux_arm64 linux_armv7 \
@@ -739,7 +742,7 @@ site/.eslintignore site/.prettierignore: .prettierignore Makefile
739742
done < "$<"
740743

741744
test:
742-
gotestsum --format standard-quiet -- -v -short -count=1 ./...
745+
$(GIT_FLAGS) gotestsum --format standard-quiet -- -v -short -count=1 ./...
743746
.PHONY: test
744747

745748
# sqlc-cloud-is-setup will fail if no SQLc auth token is set. Use this as a
@@ -775,7 +778,7 @@ sqlc-vet: test-postgres-docker
775778
test-postgres: test-postgres-docker
776779
# The postgres test is prone to failure, so we limit parallelism for
777780
# more consistent execution.
778-
DB=ci DB_FROM=$(shell go run scripts/migrate-ci/main.go) gotestsum \
781+
$(GIT_FLAGS) DB=ci DB_FROM=$(shell go run scripts/migrate-ci/main.go) gotestsum \
779782
--junitfile="gotests.xml" \
780783
--jsonfile="gotests.json" \
781784
--packages="./..." -- \
@@ -824,7 +827,7 @@ test-postgres-docker:
824827

825828
# Make sure to keep this in sync with test-go-race from .github/workflows/ci.yaml.
826829
test-race:
827-
gotestsum --junitfile="gotests.xml" -- -race -count=1 ./...
830+
$(GIT_FLAGS) gotestsum --junitfile="gotests.xml" -- -race -count=1 ./...
828831
.PHONY: test-race
829832

830833
test-tailnet-integration:

0 commit comments

Comments
 (0)