Skip to content

Commit 16f6242

Browse files
matifalimatifali
authoredApr 7, 2023
Merge branch 'coder:main' into update-code-server
2 parents dc499aa + dd85ea8 commit 16f6242

File tree

472 files changed

+25040
-8880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

472 files changed

+25040
-8880
lines changed
 

‎.github/workflows/ci.yaml

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
uses: actions/checkout@v3
3636

3737
# Install Go!
38-
- uses: actions/setup-go@v3
38+
- uses: actions/setup-go@v4
3939
with:
4040
go-version: "~1.20"
4141

4242
# Check for any typos!
4343
- name: Check for typos
44-
uses: crate-ci/typos@v1.13.14
44+
uses: crate-ci/typos@v1.14.3
4545
with:
4646
config: .github/workflows/typos.toml
4747
- name: Fix the typos
@@ -150,7 +150,7 @@ jobs:
150150
- name: Install node_modules
151151
run: ./scripts/yarn_install.sh
152152

153-
- uses: actions/setup-go@v3
153+
- uses: actions/setup-go@v4
154154
with:
155155
go-version: "~1.20"
156156

@@ -174,7 +174,7 @@ jobs:
174174

175175
- name: Install sqlc
176176
run: |
177-
curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.16.0/sqlc_1.16.0_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc
177+
curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.17.2/sqlc_1.17.2_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc
178178
- name: Install protoc-gen-go
179179
run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26
180180
- name: Install protoc-gen-go-drpc
@@ -250,18 +250,15 @@ jobs:
250250
steps:
251251
- uses: actions/checkout@v3
252252

253-
- uses: actions/setup-go@v3
253+
- uses: actions/setup-go@v4
254254
with:
255255
go-version: "~1.20"
256256

257-
# Sadly the new "set output" syntax (of writing env vars to
258-
# $GITHUB_OUTPUT) does not work on both powershell and bash so we use the
259-
# deprecated syntax here.
260257
- name: Echo Go Cache Paths
261258
id: go-cache-paths
262259
run: |
263-
echo "::set-output name=GOCACHE::$(go env GOCACHE)"
264-
echo "::set-output name=GOMODCACHE::$(go env GOMODCACHE)"
260+
echo "GOCACHE=$(go env GOCACHE)" >> ${{ runner.os == 'Windows' && '$env:' || '$' }}GITHUB_OUTPUT
261+
echo "GOMODCACHE=$(go env GOMODCACHE)" >> ${{ runner.os == 'Windows' && '$env:' || '$' }}GITHUB_OUTPUT
265262
266263
- name: Go Build Cache
267264
uses: actions/cache@v3
@@ -276,7 +273,7 @@ jobs:
276273
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
277274

278275
- name: Install gotestsum
279-
uses: jaxxstorm/action-install-gh-release@v1.9.0
276+
uses: jaxxstorm/action-install-gh-release@v1.10.0
280277
env:
281278
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
282279
with:
@@ -302,7 +299,14 @@ jobs:
302299
echo "cover=false" >> $GITHUB_OUTPUT
303300
fi
304301
305-
gotestsum --junitfile="gotests.xml" --packages="./..." -- -parallel=8 -timeout=7m -short -failfast $COVERAGE_FLAGS
302+
gotestsum --junitfile="gotests.xml" --jsonfile="gotests.json" --packages="./..." -- -parallel=8 -timeout=7m -short -failfast $COVERAGE_FLAGS
303+
304+
- name: Print test stats
305+
if: success() || failure()
306+
run: |
307+
# Artifacts are not available after rerunning a job,
308+
# so we need to print the test stats to the log.
309+
go run ./scripts/ci-report/main.go gotests.json | tee gotests_stats.json
306310
307311
- uses: actions/upload-artifact@v3
308312
if: success() || failure()
@@ -333,7 +337,7 @@ jobs:
333337
steps:
334338
- uses: actions/checkout@v3
335339

336-
- uses: actions/setup-go@v3
340+
- uses: actions/setup-go@v4
337341
with:
338342
go-version: "~1.20"
339343

@@ -356,7 +360,7 @@ jobs:
356360
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
357361

358362
- name: Install gotestsum
359-
uses: jaxxstorm/action-install-gh-release@v1.9.0
363+
uses: jaxxstorm/action-install-gh-release@v1.10.0
360364
env:
361365
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
362366
with:
@@ -372,6 +376,13 @@ jobs:
372376
run: |
373377
make test-postgres
374378
379+
- name: Print test stats
380+
if: success() || failure()
381+
run: |
382+
# Artifacts are not available after rerunning a job,
383+
# so we need to print the test stats to the log.
384+
go run ./scripts/ci-report/main.go gotests.json | tee gotests_stats.json
385+
375386
- uses: actions/upload-artifact@v3
376387
if: success() || failure()
377388
with:
@@ -416,7 +427,7 @@ jobs:
416427
- name: Set up Google Cloud SDK
417428
uses: google-github-actions/setup-gcloud@v1
418429

419-
- uses: actions/setup-go@v3
430+
- uses: actions/setup-go@v4
420431
with:
421432
go-version: "~1.20"
422433

@@ -545,7 +556,7 @@ jobs:
545556
.eslintcache
546557
key: js-${{ runner.os }}-e2e-${{ hashFiles('**/yarn.lock') }}
547558

548-
- uses: actions/setup-go@v3
559+
- uses: actions/setup-go@v4
549560
with:
550561
go-version: "~1.20"
551562

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
username: ${{ github.actor }}
9191
password: ${{ secrets.GITHUB_TOKEN }}
9292

93-
- uses: actions/setup-go@v3
93+
- uses: actions/setup-go@v4
9494
with:
9595
go-version: "~1.20"
9696

0 commit comments

Comments
 (0)