Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit38a0f7b

Browse files
committed
Merge branch 'main' of github.com:coder/coder into bq/3516
2 parentse965305 +d0b02e5 commit38a0f7b

File tree

253 files changed

+6248
-3322
lines changed

Some content is hidden

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

253 files changed

+6248
-3322
lines changed

‎.github/pull_request_template.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
<!-- Help reviewers by listing the subtasks in this PR
2-
3-
Here's an example:
4-
5-
This PR adds a new feature to the CLI.
6-
7-
## Subtasks
8-
9-
- [x] added a test for feature
10-
11-
Fixes #345
12-
1+
<!--
2+
Check if your change requires documentation edits before merging: https://coder.com/docs/coder. Make edits in `docs/`.
133
-->

‎.github/workflows/coder.yaml

Lines changed: 20 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -193,16 +193,6 @@ jobs:
193193
-name:Install node_modules
194194
run:./scripts/yarn_install.sh
195195

196-
-name:Install Protoc
197-
run:|
198-
# protoc must be in lockstep with our dogfood Dockerfile
199-
# or the version in the comments will differ.
200-
set -x
201-
cd dogfood
202-
DOCKER_BUILDKIT=1 docker build . --target proto -t protoc
203-
protoc_dir=/usr/local/bin/protoc
204-
docker run --rm --entrypoint cat protoc /tmp/bin/protoc > $protoc_dir
205-
chmod +x $protoc_dir
206196
-uses:actions/setup-go@v3
207197
with:
208198
go-version:"~1.19"
@@ -235,6 +225,18 @@ jobs:
235225
-name:Install goimports
236226
run:go install golang.org/x/tools/cmd/goimports@latest
237227

228+
-name:Install Protoc
229+
run:|
230+
# protoc must be in lockstep with our dogfood Dockerfile
231+
# or the version in the comments will differ.
232+
set -x
233+
cd dogfood
234+
DOCKER_BUILDKIT=1 docker build . --target proto -t protoc
235+
protoc_path=/usr/local/bin/protoc
236+
docker run --rm --entrypoint cat protoc /tmp/bin/protoc > $protoc_path
237+
chmod +x $protoc_path
238+
protoc --version
239+
238240
-name:make gen
239241
run:"make --output-sync -j -B gen"
240242

@@ -342,15 +344,6 @@ jobs:
342344
fi
343345
gotestsum --junitfile="gotests.xml" --packages="./..." -- -parallel=8 -timeout=$test_timeout -short -failfast $COVERAGE_FLAGS
344346
345-
-name:Upload DataDog Trace
346-
if:github.actor != 'dependabot[bot]' && !github.event.pull_request.head.repo.fork
347-
env:
348-
DATADOG_API_KEY:${{ secrets.DATADOG_API_KEY }}
349-
DD_DATABASE:fake
350-
DD_CATEGORY:unit
351-
GIT_COMMIT_MESSAGE:${{ github.event.head_commit.message }}
352-
run:go run scripts/datadog-cireport/main.go gotests.xml
353-
354347
-uses:codecov/codecov-action@v3
355348
# This action has a tendency to error out unexpectedly, it has
356349
# the `fail_ci_if_error` option that defaults to `false`, but
@@ -412,14 +405,6 @@ jobs:
412405
-name:Test with PostgreSQL Database
413406
run:make test-postgres
414407

415-
-name:Upload DataDog Trace
416-
if:always() && github.actor != 'dependabot[bot]' && !github.event.pull_request.head.repo.fork
417-
env:
418-
DATADOG_API_KEY:${{ secrets.DATADOG_API_KEY }}
419-
DD_DATABASE:postgresql
420-
GIT_COMMIT_MESSAGE:${{ github.event.head_commit.message }}
421-
run:go run scripts/datadog-cireport/main.go gotests.xml
422-
423408
-uses:codecov/codecov-action@v3
424409
# This action has a tendency to error out unexpectedly, it has
425410
# the `fail_ci_if_error` option that defaults to `false`, but
@@ -498,35 +483,21 @@ jobs:
498483
-name:Install zstd
499484
run:sudo apt-get install -y zstd
500485

501-
-name:Build site
502-
run:make -B site/out/index.html
503-
504486
-name:Build Release
505487
run:|
506488
set -euo pipefail
507489
go mod download
508490
509-
mkdir -p ./dist
510-
# build slim binaries
511-
./scripts/build_go_slim.sh \
512-
--output ./dist/ \
513-
--compress 22 \
514-
linux:amd64,armv7,arm64 \
515-
windows:amd64,arm64 \
516-
darwin:amd64,arm64
517-
518-
# build linux amd64 packages
519-
./scripts/build_go_matrix.sh \
520-
--output ./dist/ \
521-
--package-linux \
522-
linux:amd64 \
523-
windows:amd64
491+
version="$(./scripts/version.sh)"
492+
make -j \
493+
build/coder_"$version"_windows_amd64.zip \
494+
build/coder_"$version"_linux_amd64.{tar.gz,deb}
524495
525496
-name:Install Release
526497
run:|
527498
gcloud config set project coder-dogfood
528499
gcloud config set compute/zone us-central1-a
529-
gcloud compute scp ./dist/coder_*_linux_amd64.deb coder:/tmp/coder.deb
500+
gcloud compute scp ./build/coder_*_linux_amd64.deb coder:/tmp/coder.deb
530501
gcloud compute ssh coder -- sudo dpkg -i --force-confdef /tmp/coder.deb
531502
gcloud compute ssh coder -- sudo systemctl daemon-reload
532503
@@ -537,12 +508,9 @@ jobs:
537508
with:
538509
name:coder
539510
path:|
540-
./dist/*.zip
541-
./dist/*.exe
542-
./dist/*.tar.gz
543-
./dist/*.apk
544-
./dist/*.deb
545-
./dist/*.rpm
511+
./build/*.zip
512+
./build/*.tar.gz
513+
./build/*.deb
546514
retention-days:7
547515

548516
test-js:
@@ -563,11 +531,6 @@ jobs:
563531
restore-keys:|
564532
js-${{ runner.os }}-
565533
566-
# Go is required for uploading the test results to datadog
567-
-uses:actions/setup-go@v3
568-
with:
569-
go-version:"~1.19"
570-
571534
-uses:actions/setup-node@v3
572535
with:
573536
node-version:"14"
@@ -590,14 +553,6 @@ jobs:
590553
files:./site/coverage/lcov.info
591554
flags:unittest-js
592555

593-
-name:Upload DataDog Trace
594-
if:always() && github.actor != 'dependabot[bot]' && !github.event.pull_request.head.repo.fork
595-
env:
596-
DATADOG_API_KEY:${{ secrets.DATADOG_API_KEY }}
597-
DD_CATEGORY:unit
598-
GIT_COMMIT_MESSAGE:${{ github.event.head_commit.message }}
599-
run:go run scripts/datadog-cireport/main.go site/test-results/junit.xml
600-
601556
test-e2e:
602557
name:"test/e2e/${{ matrix.os }}"
603558
needs:
@@ -621,7 +576,6 @@ jobs:
621576
.eslintcache
622577
key:js-${{ runner.os }}-e2e-${{ hashFiles('**/yarn.lock') }}
623578

624-
# Go is required for uploading the test results to datadog
625579
-uses:actions/setup-go@v3
626580
with:
627581
go-version:"~1.19"
@@ -677,13 +631,6 @@ jobs:
677631
path:./site/test-results/**/*.webm
678632
retention:days:7
679633

680-
-name:Upload DataDog Trace
681-
if:always() && github.actor != 'dependabot[bot]' && runner.os == 'Linux' && !github.event.pull_request.head.repo.fork
682-
env:
683-
DATADOG_API_KEY:${{ secrets.DATADOG_API_KEY }}
684-
DD_CATEGORY:e2e
685-
GIT_COMMIT_MESSAGE:${{ github.event.head_commit.message }}
686-
run:go run scripts/datadog-cireport/main.go site/test-results/junit.xml
687634
chromatic:
688635
# REMARK: this is only used to build storybook and deploy it to Chromatic.
689636
runs-on:ubuntu-latest

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp