Skip to content

Commit fc306f5

Browse files
mtojekmtojek
committed
Merge branch 'main' into 8789-update-params
2 parents d436155 + 80425c3 commit fc306f5

File tree

5 files changed

+12
-28
lines changed

5 files changed

+12
-28
lines changed

‎.github/dependabot.yaml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ updates:
88
timezone: "America/Chicago"
99
labels: []
1010
commit-message:
11-
prefix: "chore"
11+
prefix: "ci"
1212
ignore:
1313
# These actions deliver the latest versions by updating the major
1414
# release tag, so ignore minor and patch versions
@@ -117,11 +117,6 @@ updates:
117117
- "@eslint*"
118118
- "@typescript-eslint/eslint-plugin"
119119
- "@typescript-eslint/parser"
120-
jest:
121-
patterns:
122-
- "jest*"
123-
- "@swc/jest"
124-
- "@types/jest"
125120

126121
- package-ecosystem: "npm"
127122
directory: "/offlinedocs/"
@@ -146,20 +141,6 @@ updates:
146141
- version-update:semver-major
147142

148143
# Update dogfood.
149-
- package-ecosystem: "docker"
150-
directory: "/dogfood/"
151-
schedule:
152-
interval: "weekly"
153-
time: "06:00"
154-
timezone: "America/Chicago"
155-
commit-message:
156-
prefix: "chore"
157-
labels: []
158-
groups:
159-
dogfood-docker:
160-
patterns:
161-
- "*"
162-
163144
- package-ecosystem: "terraform"
164145
directory: "/dogfood/"
165146
schedule:

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
138138
# Check for any typos
139139
- name: Check for typos
140-
uses: crate-ci/typos@v1.16.6
140+
uses: crate-ci/typos@v1.16.8
141141
with:
142142
config: .github/workflows/typos.toml
143143

‎go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ require (
8686
github.com/charmbracelet/glamour v0.6.0
8787
// In later at least v0.7.1, lipgloss changes its terminal detection
8888
// which breaks most of our CLI golden files tests.
89-
github.com/charmbracelet/lipgloss v0.7.1
89+
github.com/charmbracelet/lipgloss v0.8.0
9090
github.com/cli/safeexec v1.0.1
9191
github.com/codeclysm/extract/v3 v3.1.1
9292
github.com/coder/flog v1.1.0
@@ -116,7 +116,6 @@ require (
116116
github.com/go-playground/validator/v10 v10.15.0
117117
github.com/gofrs/flock v0.8.1
118118
github.com/gohugoio/hugo v0.117.0
119-
github.com/golang-jwt/jwt v3.2.2+incompatible
120119
github.com/golang-jwt/jwt/v4 v4.5.0
121120
github.com/golang-migrate/migrate/v4 v4.16.0
122121
github.com/golang/mock v1.6.0
@@ -185,7 +184,7 @@ require (
185184
golang.org/x/sys v0.11.0
186185
golang.org/x/term v0.11.0
187186
golang.org/x/text v0.12.0
188-
golang.org/x/time v0.3.0
187+
golang.org/x/time v0.3.0 // indirect
189188
golang.org/x/tools v0.12.0
190189
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
191190
golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b

‎go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ github.com/charmbracelet/glamour v0.6.0 h1:wi8fse3Y7nfcabbbDuwolqTqMQPMnVPeZhDM2
177177
github.com/charmbracelet/glamour v0.6.0/go.mod h1:taqWV4swIMMbWALc0m7AfE9JkPSU8om2538k9ITBxOc=
178178
github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
179179
github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk=
180-
github.com/charmbracelet/lipgloss v0.7.1 h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZpc5Kc1E=
181-
github.com/charmbracelet/lipgloss v0.7.1/go.mod h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c=
180+
github.com/charmbracelet/lipgloss v0.8.0 h1:IS00fk4XAHcf8uZKc3eHeMUTCxUH6NkaTrdyCQk84RU=
181+
github.com/charmbracelet/lipgloss v0.8.0/go.mod h1:p4eYUZZJ/0oXTuCQKFF8mqyKCz0ja6y+7DniDDw5KKU=
182182
github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
183183
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
184184
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -391,8 +391,6 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
391391
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
392392
github.com/gohugoio/hugo v0.117.0 h1:VP7MVke7R36zjUkWezg7mEtfnwHm2L5u0JwvMHvcsZQ=
393393
github.com/gohugoio/hugo v0.117.0/go.mod h1:b6mjGjvIqRD36x+ePNDhn1ZCXdWBkvu95+dZNTCuoDM=
394-
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
395-
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
396394
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
397395
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
398396
github.com/golang-migrate/migrate/v4 v4.16.0 h1:FU2GR7EdAO0LmhNLcKthfDzuYCtMcWNR7rUbZjsgH3o=

‎site/e2e/helpers.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@ export const createWorkspace = async (
3838
await page.getByTestId("form-submit").click()
3939

4040
await expect(page).toHaveURL("/@admin/" + name)
41+
42+
// FIXME: workaround for https://github.com/coder/coder/issues/8566
43+
const reloadTimer = setInterval(async () => {
44+
await page.reload()
45+
}, 3000)
4146
await page.waitForSelector(
4247
"span[data-testid='build-status'] >> text=Running",
4348
{
4449
state: "visible",
4550
},
4651
)
52+
clearInterval(reloadTimer)
4753
return name
4854
}
4955

0 commit comments

Comments
 (0)