Skip to content

Commit 9748e39

Browse files
BrunoQuaresmaBrunoQuaresma
committed
chore: Merge branch 'main' of github.com:coder/coder into bq/usermenu
2 parents 5dae508 + 23f9891 commit 9748e39

27 files changed

+787
-107
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: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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+
chromatic-deployment:
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+
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
37+
workingDir: "./site"
38+
39+
# This is a separate step for mainline only that auto accepts and changes
40+
# instead of holding CI up. Since we squash/merge, this is defensive to
41+
# avoid the same changeset from requiring review once squashed into
42+
# main. Chromatic is supposed to be able to detect that we use squash
43+
# commits, but it's good to be defensive in case, otherwise CI remains
44+
# infinitely "in progress" in mainline unless we re-review each build.
45+
- name: Publish to Chromatic (mainline)
46+
if: github.ref == 'refs/heads/main'
47+
uses: chromaui/action@v1
48+
with:
49+
autoAcceptChanges: true
50+
buildScriptName: "storybook:build"
51+
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
52+
workingDir: "./site"

‎.github/workflows/coder.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,6 @@ jobs:
387387
run: yarn build
388388
working-directory: site
389389

390-
- name: Build Storybook
391-
run: yarn storybook:build
392-
working-directory: site
393-
394390
- run: yarn test:coverage
395391
working-directory: site
396392

‎.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.

‎.goreleaser.yml renamed to ‎.goreleaser.yaml

File renamed without changes.

0 commit comments

Comments
 (0)