Skip to content

Commit 31491e9

Browse files
committed
revert CI changes
1 parent a5304dc commit 31491e9

File tree

2 files changed

+4
-96
lines changed

2 files changed

+4
-96
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -370,19 +370,15 @@ jobs:
370370
api-key: ${{ secrets.DATADOG_API_KEY }}
371371

372372
test-go-pg:
373-
runs-on: ${{ matrix.os == 'ubuntu-latest' && github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || matrix.os == 'windows-2022' && github.repository_owner == 'coder' && 'windows-latest-16-cores' || matrix.os }}
374-
needs: changes
373+
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
374+
needs:
375+
- changes
375376
if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
376377
# This timeout must be greater than the timeout set by `go test` in
377378
# `make test-postgres` to ensure we receive a trace of running
378379
# goroutines. Setting this to the timeout +5m should work quite well
379380
# even if some of the preceding steps are slow.
380381
timeout-minutes: 25
381-
strategy:
382-
matrix:
383-
os:
384-
- ubuntu-latest
385-
- windows-2022
386382
steps:
387383
- name: Harden Runner
388384
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
@@ -404,31 +400,8 @@ jobs:
404400
env:
405401
POSTGRES_VERSION: "13"
406402
TS_DEBUG_DISCO: "true"
407-
shell: bash
408403
run: |
409-
# if macOS, install google-chrome for scaletests
410-
# As another concern, should we really have this kind of external dependency
411-
# requirement on standard CI?
412-
if [ "${{ matrix.os }}" == "macos-latest" ]; then
413-
brew install google-chrome
414-
fi
415-
416-
# By default Go will use the number of logical CPUs, which
417-
# is a fine default.
418-
PARALLEL_FLAG=""
419-
420-
# macOS will output "The default interactive shell is now zsh"
421-
# intermittently in CI...
422-
if [ "${{ matrix.os }}" == "macos-latest" ]; then
423-
touch ~/.bash_profile && echo "export BASH_SILENCE_DEPRECATION_WARNING=1" >> ~/.bash_profile
424-
fi
425-
426-
if [ "${{ runner.os }}" == "Linux" ]; then
427-
make test-postgres
428-
else
429-
go run scripts/embedded-pg/main.go
430-
DB=ci gotestsum --format standard-quiet -- -v -short -count=1 ./...
431-
fi
404+
make test-postgres
432405
433406
- name: Upload test stats to Datadog
434407
timeout-minutes: 1

scripts/embedded-pg/main.go

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)