Jul 22, 2022 · Jul 22, 2022
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
  test-go-postgres:
    name: "test/go/postgres"
    runs-on: ubuntu-latest
    # This timeout must be greater than go test -timeout.
    # This timeout must be greater than the timeout set by `go test` in
    # `make test-postgres` to ensure we receive a trace of running
    # goroutines. Setting this to the timeout +5m should work quite well
    # even if some of the preceding steps are slow.
    timeout-minutes: 25
    steps:
      - uses: actions/checkout@v3
diff --git a/Makefile b/Makefile
 gotestsum -- -v -short ./...
 .PHONY: test

 # When updating -timeout for this test, keep in sync with
 # test-go-postgres (.github/workflows/coder.yaml).
 test-postgres: test-clean test-postgres-docker
 DB=ci DB_FROM=$(shell go run scripts/migrate-ci/main.go) gotestsum --junitfile="gotests.xml" --packages="./..." -- \
 -covermode=atomic -coverprofile="gotests.coverage" -timeout=30m \
 -covermode=atomic -coverprofile="gotests.coverage" -timeout=20m \
 -coverpkg=./...,github.com/coder/coder/codersdk \
 -count=1 -race -failfast
 .PHONY: test-postgres
Original file line number	Diff line number	Diff line change
Expand Up		@@ -233,7 +233,10 @@ jobs:
		test-go-postgres:
		name: "test/go/postgres"
		runs-on: ubuntu-latest
		# This timeout must be greater than go test -timeout.
		# This timeout must be greater than the timeout set by `go test` in
		# `make test-postgres` to ensure we receive a trace of running
		# goroutines. Setting this to the timeout +5m should work quite well
		# even if some of the preceding steps are slow.
		timeout-minutes: 25
		steps:
		- uses: actions/checkout@v3
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -171,9 +171,11 @@ test: test-clean
		gotestsum -- -v -short ./...
		.PHONY: test

		# When updating -timeout for this test, keep in sync with
		# test-go-postgres (.github/workflows/coder.yaml).
		test-postgres: test-clean test-postgres-docker
		DB=ci DB_FROM=$(shell go run scripts/migrate-ci/main.go) gotestsum --junitfile="gotests.xml" --packages="./..." -- \
		-covermode=atomic -coverprofile="gotests.coverage" -timeout=30m \
		-covermode=atomic -coverprofile="gotests.coverage" -timeout=20m \
		-coverpkg=./...,github.com/coder/coder/codersdk \
		-count=1 -race -failfast
		.PHONY: test-postgres
Expand Down