Skip to content

Commit fd90bc9

Browse files
committed
Merge branch 'main' into fastwin
2 parents 429f70d + a48a838 commit fd90bc9

File tree

108 files changed

+3604
-906
lines changed

Some content is hidden

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

108 files changed

+3604
-906
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!--- Provide a general summary of the issue in the Title above -->
2+
3+
## Expected Behavior
4+
5+
<!--- Tell us what should happen -->
6+
7+
## Current Behavior
8+
9+
<!--- Tell us what happens instead of the expected behavior -->

.github/workflows/coder.yaml

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,8 @@ jobs:
111111
- uses: actions/setup-go@v3
112112
with:
113113
go-version: "~1.18"
114-
- run: curl -sSL
115-
https://github.com/kyleconroy/sqlc/releases/download/v1.13.0/sqlc_1.13.0_linux_amd64.tar.gz
116-
| sudo tar -C /usr/bin -xz sqlc
114+
- run: |
115+
curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.13.0/sqlc_1.13.0_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc
117116
118117
- run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26
119118
- run: go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.26
@@ -188,7 +187,7 @@ jobs:
188187
path: ${{ steps.go-cache-paths.outputs.go-mod }}
189188
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
190189

191-
- name: Install goreleaser
190+
- name: Install gotestsum
192191
uses: jaxxstorm/action-install-gh-release@v1.7.1
193192
env:
194193
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -223,7 +222,7 @@ jobs:
223222
token: ${{ secrets.CODECOV_TOKEN }}
224223
files: ./gotests.coverage
225224
flags: unittest-go-${{ matrix.os }}
226-
# this flakes and sometimes fails the build
225+
# this flakes and sometimes fails the build
227226
fail_ci_if_error: false
228227

229228
test-go-postgres:
@@ -255,7 +254,7 @@ jobs:
255254
path: ${{ steps.go-cache-paths.outputs.go-mod }}
256255
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
257256

258-
- name: Install goreleaser
257+
- name: Install gotestsum
259258
uses: jaxxstorm/action-install-gh-release@v1.7.1
260259
env:
261260
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -307,7 +306,7 @@ jobs:
307306
token: ${{ secrets.CODECOV_TOKEN }}
308307
files: ./gotests.coverage
309308
flags: unittest-go-postgres-${{ matrix.os }}
310-
# this flakes and sometimes fails the build
309+
# this flakes and sometimes fails the build
311310
fail_ci_if_error: false
312311

313312
deploy:
@@ -320,6 +319,8 @@ jobs:
320319
id-token: write
321320
steps:
322321
- uses: actions/checkout@v3
322+
with:
323+
fetch-depth: 0
323324

324325
- name: Authenticate to Google Cloud
325326
uses: google-github-actions/auth@v0
@@ -363,18 +364,30 @@ jobs:
363364
restore-keys: |
364365
js-${{ runner.os }}-
365366
366-
- uses: goreleaser/goreleaser-action@v3
367-
with:
368-
install-only: true
367+
- name: Install nfpm
368+
run: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.16.0
369369

370370
- name: Build site
371371
run: make -B site/out/index.html
372372

373373
- name: Build Release
374-
uses: goreleaser/goreleaser-action@v3
375-
with:
376-
version: latest
377-
args: release --snapshot --rm-dist --skip-sign
374+
run: |
375+
set -euo pipefail
376+
go mod download
377+
378+
mkdir -p ./dist
379+
# build slim binaries
380+
./scripts/build_go_slim.sh \
381+
--output ./dist/ \
382+
linux:amd64,armv7,arm64 \
383+
windows:amd64,arm64 \
384+
darwin:amd64,arm64
385+
386+
# build linux amd64 packages
387+
./scripts/build_go_matrix.sh \
388+
--output ./dist/ \
389+
--package-linux \
390+
linux:amd64
378391
379392
- name: Install Release
380393
run: |
@@ -391,8 +404,11 @@ jobs:
391404
with:
392405
name: coder
393406
path: |
394-
./dist/coder_*_linux_amd64.tar.gz
395-
./dist/coder_*_windows_amd64.zip
407+
./dist/*.zip
408+
./dist/*.tar.gz
409+
./dist/*.apk
410+
./dist/*.deb
411+
./dist/*.rpm
396412
retention-days: 7
397413

398414
test-js:
@@ -434,7 +450,7 @@ jobs:
434450
token: ${{ secrets.CODECOV_TOKEN }}
435451
files: ./site/coverage/lcov.info
436452
flags: unittest-js
437-
# this flakes and sometimes fails the build
453+
# this flakes and sometimes fails the build
438454
fail_ci_if_error: false
439455

440456
- name: Upload DataDog Trace
@@ -481,10 +497,6 @@ jobs:
481497
with:
482498
node-version: "14"
483499

484-
- uses: goreleaser/goreleaser-action@v3
485-
with:
486-
install-only: true
487-
488500
- name: Echo Go Cache Paths
489501
id: go-cache-paths
490502
run: |

0 commit comments

Comments
 (0)