Skip to content

Commit 07951a7

Browse files
committed
Merge remote-tracking branch 'origin/main' into cj/rbac_table_driven
2 parents f620ebf + fb9dc4f commit 07951a7

File tree

292 files changed

+11677
-5544
lines changed

Some content is hidden

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

292 files changed

+11677
-5544
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
site @coder/coder-frontend
1+
site @coder/frontend
2+
site/src/xServices @presleyp

.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 :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 :memo:"
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/ISSUE_TEMPLATE/feature.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea to improve coder
4+
title: "Feat: "
5+
labels: "new feature :sparkles:"
6+
---
7+
8+
## What is your suggestion?
9+
10+
## Why do you want this feature?
11+
12+
## Are there any workarounds to get this functionality today?
13+
14+
## Are you interested in submitting a PR for this?

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ updates:
4141
timezone: "America/Chicago"
4242
commit-message:
4343
prefix: "chore"
44+
labels:
45+
- "dependencies"
46+
- "typescript/js"
4447
ignore:
4548
# Ignore major updates to Node.js types, because they need to
4649
# correspond to the Node.js engine version

.github/pull_request_template.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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+
13+
-->
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.

0 commit comments

Comments
 (0)