Skip to content

Commit 25c5056

Browse files
presleyppresleyp
committed
Merge branch 'main' into admin/presleyp/591
2 parents 8b4834f + 770d212 commit 25c5056

File tree

138 files changed

+4578
-2966
lines changed

Some content is hidden

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

138 files changed

+4578
-2966
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
---
2+
name: Bug report
3+
about: Report a bug
4+
title: "Bug: "
5+
labels: "bug 🐛"
6+
---
7+
8+
## OS Information
9+
10+
- OS:
11+
- Browser (if applicable):
12+
- Architecture:
13+
- `coder --version`:
14+
15+
## Steps to Reproduce
16+
17+
<!-- 1. -->
18+
<!-- 2. -->
19+
<!-- 3. -->
20+
21+
## Expected
22+
23+
<!-- What should happen? -->
24+
25+
## Actual
26+
27+
<!-- What actually happens? -->
28+
29+
## Logs
30+
31+
## Screenshot
32+
33+
<!-- Ideally provide a screenshot, gif, video or screen recording. -->
34+
35+
## Notes
36+
37+
<!-- Anything else you want to share -->

‎.github/ISSUE_TEMPLATE/config.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: true
2+
contact_links:
3+
- name: Question?
4+
url: https://github.com/coder/coder/discussions/new?category=q-a
5+
about: Ask for help on our GitHub Discussions board

‎.github/ISSUE_TEMPLATE/doc.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: Documentation improvement
3+
about: Suggest a documentation improvement
4+
title: "Docs: "
5+
labels: "documentation 📝"
6+
---
7+
8+
## What is your suggestion?
9+
10+
## How will this improve the docs?
11+
12+
## Are you interested in submitting a PR for this?

‎.github/dependabot.yml renamed to ‎.github/dependabot.yaml

File renamed without changes.

‎.github/stale.yml renamed to ‎.github/stale.yaml

File renamed without changes.

‎.github/workflows/chromatic.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Note: Chromatic is a separate workflow for coder.yaml as suggested by the
2+
# chromatic docs. Explicitly, Chromatic works best on 'push' instead of other
3+
# event types (like pull request), keep in mind that it works build-over-build
4+
# by storing snapshots.
5+
#
6+
# SEE: https://www.chromatic.com/docs/ci
7+
name: chromatic
8+
9+
# Chromatic works best with push events, not pull_request or other event types.
10+
on: push
11+
12+
jobs:
13+
deploy:
14+
# REMARK: this is only used to build storybook and deploy it to Chromatic.
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v3
19+
with:
20+
# Required by Chromatic for build-over-build history, otherwise we
21+
# only get 1 commit on shallow checkout.
22+
fetch-depth: 0
23+
24+
- name: Install dependencies
25+
run: cd site && yarn
26+
27+
# This step is not meant for mainline because any detected changes to
28+
# storybook snapshots will require manual approval/review in order for
29+
# the check to pass. This is desired in PRs, but not in mainline.
30+
- name: Publish to Chromatic (non-mainline)
31+
if: github.ref != 'refs/heads/main'
32+
uses: chromaui/action@v1
33+
with:
34+
buildScriptName: "storybook:build"
35+
exitOnceUploaded: true
36+
# Chromatic states its fine to make this token public. See:
37+
# https://www.chromatic.com/docs/github-actions#forked-repositories
38+
projectToken: 695c25b6cb65
39+
workingDir: "./site"
40+
41+
# This is a separate step for mainline only that auto accepts and changes
42+
# instead of holding CI up. Since we squash/merge, this is defensive to
43+
# avoid the same changeset from requiring review once squashed into
44+
# main. Chromatic is supposed to be able to detect that we use squash
45+
# commits, but it's good to be defensive in case, otherwise CI remains
46+
# infinitely "in progress" in mainline unless we re-review each build.
47+
- name: Publish to Chromatic (mainline)
48+
if: github.ref == 'refs/heads/main'
49+
uses: chromaui/action@v1
50+
with:
51+
autoAcceptChanges: true
52+
buildScriptName: "storybook:build"
53+
projectToken: 695c25b6cb65
54+
workingDir: "./site"

‎.github/workflows/coder-test-stability.yaml

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

‎.github/workflows/coder.yaml

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@ name: coder
22

33
on:
44
push:
5-
branches:
6-
- main
7-
- "release/*"
8-
tags:
9-
- "*"
10-
11-
pull_request:
12-
branches:
13-
- "*"
145

156
workflow_dispatch:
167

@@ -178,7 +169,7 @@ jobs:
178169
-timeout=3m -count=$GOCOUNT -short -failfast
179170

180171
- name: Upload DataDog Trace
181-
if: (success() || failure()) && github.actor != 'dependabot[bot]'
172+
if: (success() || failure()) && github.actor != 'dependabot[bot]' && github.repository_owner == 'coder'
182173
env:
183174
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
184175
DD_DATABASE: fake
@@ -187,7 +178,7 @@ jobs:
187178
run: go run scripts/datadog-cireport/main.go gotests.xml
188179

189180
- uses: codecov/codecov-action@v2
190-
if: github.actor != 'dependabot[bot]'
181+
if: github.actor != 'dependabot[bot]' && github.repository_owner == 'coder'
191182
with:
192183
token: ${{ secrets.CODECOV_TOKEN }}
193184
files: ./gotests.coverage
@@ -264,25 +255,25 @@ jobs:
264255
-count=1 -parallel=2 -race -failfast
265256

266257
- name: Upload DataDog Trace
267-
if: (success() || failure()) && github.actor != 'dependabot[bot]'
258+
if: (success() || failure()) && github.actor != 'dependabot[bot]' && github.repository_owner == 'coder'
268259
env:
269260
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
270261
DD_DATABASE: postgresql
271262
GIT_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
272263
run: go run scripts/datadog-cireport/main.go gotests.xml
273264

274265
- uses: codecov/codecov-action@v2
275-
if: github.actor != 'dependabot[bot]'
266+
if: github.actor != 'dependabot[bot]' && github.repository_owner == 'coder'
276267
with:
277268
token: ${{ secrets.CODECOV_TOKEN }}
278269
files: ./gotests.coverage
279-
flags: unittest-go-${{ matrix.os }}
270+
flags: unittest-go-postgres-${{ matrix.os }}
280271
fail_ci_if_error: true
281272

282273
deploy:
283274
name: "deploy"
284275
runs-on: ubuntu-latest
285-
if: github.ref == 'refs/heads/main'
276+
if: github.ref == 'refs/heads/main' && github.repository_owner == 'coder'
286277
permissions:
287278
contents: read
288279
id-token: write
@@ -387,23 +378,19 @@ jobs:
387378
run: yarn build
388379
working-directory: site
389380

390-
- name: Build Storybook
391-
run: yarn storybook:build
392-
working-directory: site
393-
394381
- run: yarn test:coverage
395382
working-directory: site
396383

397384
- uses: codecov/codecov-action@v2
398-
if: github.actor != 'dependabot[bot]'
385+
if: github.actor != 'dependabot[bot]' && github.repository_owner == 'coder'
399386
with:
400387
token: ${{ secrets.CODECOV_TOKEN }}
401388
files: ./site/coverage/lcov.info
402389
flags: unittest-js
403390
fail_ci_if_error: true
404391

405392
- name: Upload DataDog Trace
406-
if: (success() || failure()) && github.actor != 'dependabot[bot]'
393+
if: (success() || failure()) && github.actor != 'dependabot[bot]' && github.repository_owner == 'coder'
407394
env:
408395
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
409396
DD_CATEGORY: unit
@@ -417,10 +404,6 @@ jobs:
417404
matrix:
418405
os:
419406
- ubuntu-latest
420-
- macos-latest
421-
# TODO: Get `make build` running on Windows 2022
422-
# https://github.com/coder/coder/issues/384
423-
# - windows-2022
424407
steps:
425408
- uses: actions/checkout@v3
426409

@@ -487,7 +470,7 @@ jobs:
487470
working-directory: site
488471

489472
- name: Upload DataDog Trace
490-
if: (success() || failure()) && github.actor != 'dependabot[bot]' && runner.os == 'Linux'
473+
if: (success() || failure()) && github.actor != 'dependabot[bot]' && runner.os == 'Linux' && github.repository_owner == 'coder'
491474
env:
492475
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
493476
DD_CATEGORY: e2e

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ site/test-results/
2525
site/yarn-error.log
2626
coverage/
2727
site/**/*.typegen.ts
28+
site/build-storybook.log
2829

2930
# Build
3031
dist/

‎.golangci.yml renamed to ‎.golangci.yaml

File renamed without changes.

0 commit comments

Comments
 (0)