Skip to content

Commit f80d492

Browse files
mafredrimafredri
committed
Merge branch 'main' into mafredri/test-timeouts
2 parents 422e72b + 3d0febd commit f80d492

Some content is hidden

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

75 files changed

+1419
-582
lines changed

‎.github/codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ coverage:
1515
informational: yes
1616
project:
1717
default:
18-
target: 70%
18+
target: 65%
1919
informational: yes
2020

2121
ignore:

‎.github/dependabot.yaml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ updates:
33
- package-ecosystem: "github-actions"
44
directory: "/"
55
schedule:
6-
interval: "weekly"
6+
interval: "monthly"
77
time: "06:00"
88
timezone: "America/Chicago"
99
labels: []
@@ -28,23 +28,32 @@ updates:
2828
- package-ecosystem: "gomod"
2929
directory: "/"
3030
schedule:
31-
interval: "weekly"
31+
interval: "monthly"
3232
time: "06:00"
3333
timezone: "America/Chicago"
3434
commit-message:
3535
prefix: "chore"
3636
labels: []
37+
ignore:
38+
# Ignore patch updates for all dependencies
39+
- dependency-name: "*"
40+
update-types:
41+
- version-update:semver-patch
3742

3843
- package-ecosystem: "npm"
3944
directory: "/site/"
4045
schedule:
41-
interval: "weekly"
46+
interval: "monthly"
4247
time: "06:00"
4348
timezone: "America/Chicago"
4449
commit-message:
4550
prefix: "chore"
4651
labels: []
4752
ignore:
53+
# Ignore patch updates for all dependencies
54+
- dependency-name: "*"
55+
update-types:
56+
- version-update:semver-patch
4857
# Ignore major updates to Node.js types, because they need to
4958
# correspond to the Node.js engine version
5059
- dependency-name: "@types/node"
@@ -54,7 +63,7 @@ updates:
5463
- package-ecosystem: "terraform"
5564
directory: "/examples/templates"
5665
schedule:
57-
interval: "weekly"
66+
interval: "monthly"
5867
time: "06:00"
5968
timezone: "America/Chicago"
6069
commit-message:

‎.github/workflows/coder.yaml

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
runs-on: ubuntu-latest
3535
outputs:
3636
docs-only: ${{ steps.filter.outputs.docs_count == steps.filter.outputs.all_count }}
37-
go: ${{ steps.filter.outputs.go }}
3837
sh: ${{ steps.filter.outputs.sh }}
3938
steps:
4039
- uses: actions/checkout@v3
@@ -49,10 +48,6 @@ jobs:
4948
- 'docs/**'
5049
# For testing:
5150
# - '.github/**'
52-
go:
53-
- "**.go"
54-
- "**.mod"
55-
- "**.sum"
5651
sh:
5752
- "**.sh"
5853
- id: debug
@@ -63,36 +58,15 @@ jobs:
6358
debug-inputs:
6459
needs:
6560
- changes
66-
- pr-context
6761
runs-on: ubuntu-latest
6862
steps:
6963
- id: log
7064
run: |
7165
echo "${{ toJSON(needs) }}"
72-
echo "${{ contains(needs.pr-context.outputs.skips, 'test/go/postgres') }} "
73-
echo "${{ contains(needs.pr-context.outputs.skips, 'test/e2e') }} "
74-
75-
pr-context:
76-
runs-on: ubuntu-latest
77-
outputs:
78-
skips: ${{ steps.pr-context.outputs.skips }}
79-
steps:
80-
- uses: actions/checkout@v3
81-
- uses: actions/setup-go@v3
82-
with:
83-
go-version: "~1.18"
84-
- id: pr-context
85-
env:
86-
GITHUB_CONTEXT: ${{ toJSON(github) }}
87-
run: |
88-
(cd .github/workflows/prcontext && go build)
89-
./.github/workflows/prcontext/prcontext
9066
9167
style-lint-golangci:
9268
name: style/lint/golangci
9369
timeout-minutes: 5
94-
needs: changes
95-
if: needs.changes.outputs.go == 'true'
9670
runs-on: ubuntu-latest
9771
steps:
9872
- uses: actions/checkout@v3
@@ -108,8 +82,6 @@ jobs:
10882
name: style/lint/shellcheck
10983
timeout-minutes: 5
11084
runs-on: ubuntu-latest
111-
needs: changes
112-
if: needs.changes.outputs.sh == 'true'
11385
steps:
11486
- uses: actions/checkout@v3
11587
- name: Run ShellCheck
@@ -122,8 +94,6 @@ jobs:
12294
style-lint-typescript:
12395
name: "style/lint/typescript"
12496
timeout-minutes: 5
125-
needs: changes
126-
if: needs.changes.outputs.docs-only == 'false'
12797
runs-on: ubuntu-latest
12898
steps:
12999
- name: Checkout
@@ -207,8 +177,6 @@ jobs:
207177

208178
style-fmt:
209179
name: "style/fmt"
210-
needs: changes
211-
if: needs.changes.outputs.docs-only == 'false'
212180
runs-on: ubuntu-latest
213181
timeout-minutes: 5
214182
steps:
@@ -241,8 +209,6 @@ jobs:
241209
242210
test-go:
243211
name: "test/go"
244-
needs: changes
245-
if: needs.changes.outputs.docs-only == 'false'
246212
runs-on: ${{ matrix.os }}
247213
timeout-minutes: 20
248214
strategy:
@@ -332,12 +298,6 @@ jobs:
332298

333299
test-go-postgres:
334300
name: "test/go/postgres"
335-
needs:
336-
- changes
337-
- pr-context
338-
if: >
339-
needs.changes.outputs.docs-only == 'false' &&
340-
!contains(needs.pr-context.outputs.skips, 'test/go/postgres')
341301
runs-on: ubuntu-latest
342302
# This timeout must be greater than the timeout set by `go test` in
343303
# `make test-postgres` to ensure we receive a trace of running
@@ -518,8 +478,6 @@ jobs:
518478

519479
test-js:
520480
name: "test/js"
521-
needs: changes
522-
if: needs.changes.outputs.docs-only == 'false'
523481
runs-on: ubuntu-latest
524482
timeout-minutes: 20
525483
steps:
@@ -575,8 +533,7 @@ jobs:
575533
name: "test/e2e/${{ matrix.os }}"
576534
needs:
577535
- changes
578-
- pr-context
579-
if: needs.changes.outputs.docs-only == 'false' && !contains(needs.pr-context.outputs.skips, 'test/e2e')
536+
if: needs.changes.outputs.docs-only == 'false'
580537
runs-on: ${{ matrix.os }}
581538
timeout-minutes: 20
582539
strategy:

‎.github/workflows/prcontext/README.md

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

‎.github/workflows/prcontext/go.mod

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

‎.github/workflows/prcontext/go.sum

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

‎.github/workflows/prcontext/main.go

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

‎.github/workflows/prcontext/parse.go

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

‎.github/workflows/prcontext/parse_test.go

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

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"mattn",
4343
"mitchellh",
4444
"moby",
45+
"namesgenerator",
4546
"nfpms",
4647
"nhooyr",
4748
"nolint",

‎README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
# Coder
22

3-
[!["GitHub
4-
Discussions"](https://img.shields.io/badge/%20GitHub-%20Discussions-gray.svg?longCache=true&logo=github&colorB=purple)](https://github.com/coder/coder/discussions)
53
[!["Join us on
6-
Discord"](https://img.shields.io/badge/join-us%20on%20Discord-gray.svg?longCache=true&logo=discord&colorB=purple)](https://discord.gg/coder)
4+
Discord"](https://img.shields.io/badge/join-us%20on%20Discord-gray.svg?longCache=true&logo=discord&colorB=green)](https://discord.gg/coder)
5+
[![codecov](https://codecov.io/gh/coder/coder/branch/main/graph/badge.svg?token=TNLW3OAP6G)](https://codecov.io/gh/coder/coder)
76
[![Twitter
87
Follow](https://img.shields.io/twitter/follow/CoderHQ?label=%40CoderHQ&style=social)](https://twitter.com/coderhq)
9-
[![codecov](https://codecov.io/gh/coder/coder/branch/main/graph/badge.svg?token=TNLW3OAP6G)](https://codecov.io/gh/coder/coder)
108

119
Coder creates remote development machines so your team can develop from anywhere.
1210

@@ -31,7 +29,7 @@ Coder creates remote development machines so your team can develop from anywhere
3129
## Getting Started
3230

3331
> **Note**:
34-
> Coder is in an alpha state. [Report issues here](https://github.com/coder/coder/issues/new).
32+
> Coder is in a beta state. [Report issues here](https://github.com/coder/coder/issues/new).
3533
3634
The easiest way to install Coder is to use our [install script](https://github.com/coder/coder/blob/main/install.sh) for Linux and macOS.
3735

‎cli/cliui/cliui.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var Styles = struct {
4848
Field: defaultStyles.Code.Copy().Foreground(lipgloss.AdaptiveColor{Light: "#000000", Dark: "#FFFFFF"}),
4949
Keyword: defaultStyles.Keyword,
5050
Paragraph: defaultStyles.Paragraph,
51-
Placeholder: lipgloss.NewStyle().Foreground(lipgloss.Color("240")),
51+
Placeholder: lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Light: "#585858", Dark: "#005fff"}),
5252
Prompt: defaultStyles.Prompt.Foreground(lipgloss.AdaptiveColor{Light: "#9B9B9B", Dark: "#5C5C5C"}),
5353
FocusedPrompt: defaultStyles.FocusedPrompt.Foreground(lipgloss.Color("#651fff")),
5454
Fuschia: defaultStyles.SelectedMenuItem.Copy(),

0 commit comments

Comments
 (0)