@@ -438,7 +438,7 @@ jobs:
438
438
api-key : ${{ secrets.DATADOG_API_KEY }}
439
439
440
440
test-go-pg :
441
- runs-on : ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || matrix.os == 'macos-latest' && github.repository_owner == 'coder' && 'depot-macos-latest' || matrix.os == 'windows-2022' && github.repository_owner == 'coder' && 'windows-latest-16-cores' || matrix.os }}
441
+ runs-on : ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || matrix.os }}
442
442
needs : changes
443
443
if : needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
444
444
# This timeout must be greater than the timeout set by `go test` in
@@ -450,8 +450,6 @@ jobs:
450
450
matrix :
451
451
os :
452
452
- ubuntu-latest
453
- - macos-latest
454
- - windows-2022
455
453
steps :
456
454
- name : Harden Runner
457
455
uses : step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
@@ -482,39 +480,11 @@ jobs:
482
480
LC_ALL : " en_US.UTF-8"
483
481
shell : bash
484
482
run : |
485
- # if macOS, install google-chrome for scaletests
486
- # As another concern, should we really have this kind of external dependency
487
- # requirement on standard CI?
488
- if [ "${{ matrix.os }}" == "macos-latest" ]; then
489
- brew install google-chrome
490
- fi
491
-
492
483
# By default Go will use the number of logical CPUs, which
493
484
# is a fine default.
494
485
PARALLEL_FLAG=""
495
486
496
- # macOS will output "The default interactive shell is now zsh"
497
- # intermittently in CI...
498
- if [ "${{ matrix.os }}" == "macos-latest" ]; then
499
- touch ~/.bash_profile && echo "export BASH_SILENCE_DEPRECATION_WARNING=1" >> ~/.bash_profile
500
- fi
501
-
502
- if [ "${{ runner.os }}" == "Linux" ]; then
503
- make test-postgres
504
- elif [ "${{ runner.os }}" == "Windows" ]; then
505
- # Create a temp dir on the R: ramdisk drive for Windows. The default
506
- # C: drive is extremely slow: https://github.com/actions/runner-images/issues/8755
507
- mkdir -p "R:/temp/embedded-pg"
508
- go run scripts/embedded-pg/main.go -path "R:/temp/embedded-pg"
509
- # Reduce test parallelism, mirroring what we do for race tests.
510
- # We'd been encountering issues with timing related flakes, and
511
- # this seems to help.
512
- DB=ci gotestsum --format standard-quiet -- -v -short -count=1 -parallel 4 -p 4 ./...
513
- else
514
- go run scripts/embedded-pg/main.go
515
- # Reduce test parallelism, like for Windows above.
516
- DB=ci gotestsum --format standard-quiet -- -v -short -count=1 -parallel 4 -p 4 ./...
517
- fi
487
+ make test-postgres
518
488
519
489
- name : Upload test stats to Datadog
520
490
timeout-minutes : 1
0 commit comments