Skip to content

Commit 71f6e15

Browse files
mtojekmtojek
committed
Merge branch 'main' into flaky-test-1
2 parents 49f035c + 03328d4 commit 71f6e15

File tree

11 files changed

+82
-76
lines changed

11 files changed

+82
-76
lines changed

‎.github/workflows/coder.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Checkout
3535
uses: actions/checkout@v2
3636
- name: typos-action
37-
uses: crate-ci/typos@v1.12.12
37+
uses: crate-ci/typos@v1.13.3
3838
with:
3939
config: .github/workflows/typos.toml
4040
- name: Fix Helper
@@ -676,4 +676,8 @@ jobs:
676676
- uses: actions/checkout@master
677677
- uses: gaurav-nelson/github-action-markdown-link-check@v1
678678
with:
679+
use-quiet-mode: yes
680+
use-verbose-mode: yes
681+
check-modified-files-only: yes
682+
base-branch: main
679683
config-file: .github/workflows/mlc_config.json

‎.github/workflows/typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ doas = "doas"
1010
darcula = "darcula"
1111
Hashi = "Hashi"
1212
trialer = "trialer"
13+
encrypter = "encrypter"
1314

1415
[files]
1516
extend-exclude = [

‎coderd/httpapi/json.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
)
99

1010
// Duration wraps time.Duration and provides better JSON marshaling and
11-
// unmarshaling. The default time.Duration marshals as an integer and only
12-
// accepts integers when unmarshaling, which is not very user friendly as users
11+
// unmarshalling. The default time.Duration marshals as an integer and only
12+
// accepts integers when unmarshalling, which is not very user friendly as users
1313
// cannot write durations like "1h30m".
1414
//
1515
// This type marshals as a string like "1h30m", and unmarshals from either a

‎coderd/templateversions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ func (api *API) fetchTemplateVersionDryRunJob(rw http.ResponseWriter, r *http.Re
438438
err = json.Unmarshal(job.Input, &input)
439439
if err != nil {
440440
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
441-
Message: "Internal error unmarshaling job metadata.",
441+
Message: "Internal error unmarshalling job metadata.",
442442
Detail: err.Error(),
443443
})
444444
return database.ProvisionerJob{}, false

‎dogfood/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,6 @@ RUN apt-get update --quiet && apt-get install --yes \
153153
docker-ce-cli \
154154
packer \
155155
terraform \
156-
buildah \
157-
conmon \
158-
containernetworking-plugins \
159-
crun \
160-
podman \
161-
skopeo \
162156
fish \
163157
unzip \
164158
zstd && \
@@ -172,6 +166,12 @@ RUN apt-get update --quiet && apt-get install --yes \
172166
RUN curl -L https://github.com/cli/cli/releases/download/v2.14.7/gh_2.14.7_linux_amd64.deb -o gh.deb && \
173167
dpkg -i gh.deb
174168

169+
# Install Lazygit
170+
# See https://github.com/jesseduffield/lazygit#ubuntu
171+
RUN LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v*([^"]+)".*/\1/') && \
172+
curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" && \
173+
tar xf lazygit.tar.gz -C /usr/local/bin lazygit
174+
175175
# Install frontend utilities
176176
RUN apt-get update && \
177177
# Node.js (from nodesource) and Yarn (from yarnpkg)

‎dogfood/files/etc/apt/preferences.d/kubic

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

‎dogfood/files/etc/apt/sources.list.d/kubic.list

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dogfood/files/usr/share/keyrings/kubic.gpg

-723 Bytes
Binary file not shown.

‎dogfood/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ resource "coder_agent" "dev" {
3333
curl -fsSL https://code-server.dev/install.sh | sh
3434
code-server --auth none --port 13337 &
3535
sudo service docker start
36-
if [ -f ~/personalize ]; then ~/personalize 2>&1 | tee ~/.personalize.log; fi
36+
coder dotfiles -y 2>&1 | tee ~/.personalize.log
3737
EOF
3838
}
3939

‎site/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@
9494
"@types/ua-parser-js": "0.7.36",
9595
"@types/uuid": "8.3.4",
9696
"@typescript-eslint/eslint-plugin": "5.38.1",
97-
"@typescript-eslint/parser": "5.38.1",
97+
"@typescript-eslint/parser": "5.45.1",
9898
"@xstate/cli": "0.3.0",
9999
"canvas": "2.10.0",
100100
"chromatic": "6.11.4",
101-
"eslint": "8.24.0",
101+
"eslint": "8.29.0",
102102
"eslint-config-prettier": "8.5.0",
103103
"eslint-import-resolver-alias": "1.1.2",
104104
"eslint-import-resolver-typescript": "3.5.0",

‎site/yarn.lock

Lines changed: 64 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@
11981198
resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.13.tgz#64e8825bf0ce769dac94ee39d92ebe6272020dfc"
11991199
integrity sha512-+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag==
12001200

1201-
"@eslint/eslintrc@^1.3.2":
1201+
"@eslint/eslintrc@^1.3.3":
12021202
version "1.3.3"
12031203
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
12041204
integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
@@ -1228,19 +1228,14 @@
12281228
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
12291229
integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
12301230

1231-
"@humanwhocodes/config-array@^0.10.5":
1232-
version "0.10.7"
1233-
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.7.tgz#6d53769fd0c222767e6452e8ebda825c22e9f0dc"
1234-
integrity sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==
1231+
"@humanwhocodes/config-array@^0.11.6":
1232+
version "0.11.7"
1233+
resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.7.tgz#38aec044c6c828f6ed51d5d7ae3d9b9faf6dbb0f"
1234+
integrity sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==
12351235
dependencies:
12361236
"@humanwhocodes/object-schema" "^1.2.1"
12371237
debug "^4.1.1"
1238-
minimatch "^3.0.4"
1239-
1240-
"@humanwhocodes/gitignore-to-minimatch@^1.0.2":
1241-
version "1.0.2"
1242-
resolved "https://registry.yarnpkg.com/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz#316b0a63b91c10e53f242efb4ace5c3b34e8728d"
1243-
integrity sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==
1238+
minimatch "^3.0.5"
12441239

12451240
"@humanwhocodes/module-importer@^1.0.1":
12461241
version "1.0.1"
@@ -1748,7 +1743,7 @@
17481743
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
17491744
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
17501745

1751-
"@nodelib/fs.walk@^1.2.3":
1746+
"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
17521747
version "1.2.8"
17531748
resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
17541749
integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -3352,14 +3347,14 @@
33523347
semver "^7.3.7"
33533348
tsutils "^3.21.0"
33543349

3355-
"@typescript-eslint/parser@5.38.1":
3356-
version "5.38.1"
3357-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.38.1.tgz#c577f429f2c32071b92dff4af4f5fbbbd2414bd0"
3358-
integrity sha512-LDqxZBVFFQnQRz9rUZJhLmox+Ep5kdUmLatLQnCRR6523YV+XhRjfYzStQ4MheFA8kMAfUlclHSbu+RKdRwQKw==
3350+
"@typescript-eslint/parser@5.45.1":
3351+
version "5.45.1"
3352+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.45.1.tgz#6440ec283fa1373a12652d4e2fef4cb6e7b7e8c6"
3353+
integrity sha512-JQ3Ep8bEOXu16q0ztsatp/iQfDCtvap7sp/DKo7DWltUquj5AfCOpX2zSzJ8YkAVnrQNqQ5R62PBz2UtrfmCkA==
33593354
dependencies:
3360-
"@typescript-eslint/scope-manager" "5.38.1"
3361-
"@typescript-eslint/types" "5.38.1"
3362-
"@typescript-eslint/typescript-estree" "5.38.1"
3355+
"@typescript-eslint/scope-manager" "5.45.1"
3356+
"@typescript-eslint/types" "5.45.1"
3357+
"@typescript-eslint/typescript-estree" "5.45.1"
33633358
debug "^4.3.4"
33643359

33653360
"@typescript-eslint/scope-manager@5.38.1":
@@ -3378,6 +3373,14 @@
33783373
"@typescript-eslint/types" "5.42.1"
33793374
"@typescript-eslint/visitor-keys" "5.42.1"
33803375

3376+
"@typescript-eslint/scope-manager@5.45.1":
3377+
version "5.45.1"
3378+
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.45.1.tgz#5b87d025eec7035d879b99c260f03be5c247883c"
3379+
integrity sha512-D6fCileR6Iai7E35Eb4Kp+k0iW7F1wxXYrOhX/3dywsOJpJAQ20Fwgcf+P/TDtvQ7zcsWsrJaglaQWDhOMsspQ==
3380+
dependencies:
3381+
"@typescript-eslint/types" "5.45.1"
3382+
"@typescript-eslint/visitor-keys" "5.45.1"
3383+
33813384
"@typescript-eslint/type-utils@5.38.1":
33823385
version "5.38.1"
33833386
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.38.1.tgz#7f038fcfcc4ade4ea76c7c69b2aa25e6b261f4c1"
@@ -3398,6 +3401,11 @@
33983401
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.42.1.tgz#0d4283c30e9b70d2aa2391c36294413de9106df2"
33993402
integrity sha512-Qrco9dsFF5lhalz+lLFtxs3ui1/YfC6NdXu+RAGBa8uSfn01cjO7ssCsjIsUs484vny9Xm699FSKwpkCcqwWwA==
34003403

3404+
"@typescript-eslint/types@5.45.1":
3405+
version "5.45.1"
3406+
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.1.tgz#8e1883041cee23f1bb7e1343b0139f97f6a17c14"
3407+
integrity sha512-HEW3U0E5dLjUT+nk7b4lLbOherS1U4ap+b9pfu2oGsW3oPu7genRaY9dDv3nMczC1rbnRY2W/D7SN05wYoGImg==
3408+
34013409
"@typescript-eslint/typescript-estree@5.38.1":
34023410
version "5.38.1"
34033411
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.1.tgz#657d858d5d6087f96b638ee383ee1cff52605a1e"
@@ -3424,6 +3432,19 @@
34243432
semver "^7.3.7"
34253433
tsutils "^3.21.0"
34263434

3435+
"@typescript-eslint/typescript-estree@5.45.1":
3436+
version "5.45.1"
3437+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.1.tgz#b3dc37f0c4f0fe73e09917fc735e6f96eabf9ba4"
3438+
integrity sha512-76NZpmpCzWVrrb0XmYEpbwOz/FENBi+5W7ipVXAsG3OoFrQKJMiaqsBMbvGRyLtPotGqUfcY7Ur8j0dksDJDng==
3439+
dependencies:
3440+
"@typescript-eslint/types" "5.45.1"
3441+
"@typescript-eslint/visitor-keys" "5.45.1"
3442+
debug "^4.3.4"
3443+
globby "^11.1.0"
3444+
is-glob "^4.0.3"
3445+
semver "^7.3.7"
3446+
tsutils "^3.21.0"
3447+
34273448
"@typescript-eslint/utils@5.38.1":
34283449
version "5.38.1"
34293450
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.38.1.tgz#e3ac37d7b33d1362bb5adf4acdbe00372fb813ef"
@@ -3466,6 +3487,14 @@
34663487
"@typescript-eslint/types" "5.42.1"
34673488
eslint-visitor-keys "^3.3.0"
34683489

3490+
"@typescript-eslint/visitor-keys@5.45.1":
3491+
version "5.45.1"
3492+
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.1.tgz#204428430ad6a830d24c5ac87c71366a1cfe1948"
3493+
integrity sha512-cy9ln+6rmthYWjH9fmx+5FU/JDpjQb586++x2FZlveq7GdGuLLW9a2Jcst2TGekH82bXpfmRNSwP9tyEs6RjvQ==
3494+
dependencies:
3495+
"@typescript-eslint/types" "5.45.1"
3496+
eslint-visitor-keys "^3.3.0"
3497+
34693498
"@vitejs/plugin-react@2.1.0":
34703499
version "2.1.0"
34713500
resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-2.1.0.tgz#4c99df15e71d2630601bd3018093bdc787d40e55"
@@ -6565,15 +6594,15 @@ eslint-visitor-keys@^3.3.0:
65656594
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
65666595
integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
65676596

6568-
eslint@8.24.0:
6569-
version "8.24.0"
6570-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.24.0.tgz#489516c927a5da11b3979dbfb2679394523383c8"
6571-
integrity sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==
6597+
eslint@8.29.0:
6598+
version "8.29.0"
6599+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz#d74a88a20fb44d59c51851625bc4ee8d0ec43f87"
6600+
integrity sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==
65726601
dependencies:
6573-
"@eslint/eslintrc" "^1.3.2"
6574-
"@humanwhocodes/config-array" "^0.10.5"
6575-
"@humanwhocodes/gitignore-to-minimatch" "^1.0.2"
6602+
"@eslint/eslintrc" "^1.3.3"
6603+
"@humanwhocodes/config-array" "^0.11.6"
65766604
"@humanwhocodes/module-importer" "^1.0.1"
6605+
"@nodelib/fs.walk" "^1.2.8"
65776606
ajv "^6.10.0"
65786607
chalk "^4.0.0"
65796608
cross-spawn "^7.0.2"
@@ -6589,14 +6618,14 @@ eslint@8.24.0:
65896618
fast-deep-equal "^3.1.3"
65906619
file-entry-cache "^6.0.1"
65916620
find-up "^5.0.0"
6592-
glob-parent "^6.0.1"
6621+
glob-parent "^6.0.2"
65936622
globals "^13.15.0"
6594-
globby "^11.1.0"
65956623
grapheme-splitter "^1.0.4"
65966624
ignore "^5.2.0"
65976625
import-fresh "^3.0.0"
65986626
imurmurhash "^0.1.4"
65996627
is-glob "^4.0.0"
6628+
is-path-inside "^3.0.3"
66006629
js-sdsl "^4.1.4"
66016630
js-yaml "^4.1.0"
66026631
json-stable-stringify-without-jsonify "^1.0.1"
@@ -7340,7 +7369,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
73407369
dependencies:
73417370
is-glob "^4.0.1"
73427371

7343-
glob-parent@^6.0.1:
7372+
glob-parent@^6.0.2:
73447373
version "6.0.2"
73457374
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
73467375
integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -8259,6 +8288,11 @@ is-object@^1.0.1:
82598288
resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
82608289
integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
82618290

8291+
is-path-inside@^3.0.3:
8292+
version "3.0.3"
8293+
resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
8294+
integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
8295+
82628296
is-plain-obj@^2.0.0:
82638297
version "2.1.0"
82648298
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
@@ -10202,7 +10236,7 @@ minimalistic-crypto-utils@^1.0.1:
1020210236
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
1020310237
integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
1020410238

10205-
minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
10239+
minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
1020610240
version "3.1.2"
1020710241
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
1020810242
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==

0 commit comments

Comments
 (0)