Skip to content

Commit fdc1845

Browse files
mtojekmtojek
committed
Merge branch 'main' into 8145-url-from-backend
2 parents 41459dd + 8b08a78 commit fdc1845

File tree

120 files changed

+693
-1629
lines changed

Some content is hidden

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

120 files changed

+693
-1629
lines changed

‎.github/workflows/ci.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
offlinedocs: ${{ steps.filter.outputs.offlinedocs }}
4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343
with:
4444
fetch-depth: 1
4545
# For pull requests it's not necessary to checkout the code
@@ -110,7 +110,7 @@ jobs:
110110
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
111111
steps:
112112
- name: Checkout
113-
uses: actions/checkout@v3
113+
uses: actions/checkout@v4
114114
with:
115115
fetch-depth: 1
116116

@@ -137,7 +137,7 @@ jobs:
137137
138138
# Check for any typos
139139
- name: Check for typos
140-
uses: crate-ci/typos@v1.16.10
140+
uses: crate-ci/typos@v1.16.11
141141
with:
142142
config: .github/workflows/typos.toml
143143

@@ -165,7 +165,7 @@ jobs:
165165
if: needs.changes.outputs.docs-only == 'false' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
166166
steps:
167167
- name: Checkout
168-
uses: actions/checkout@v3
168+
uses: actions/checkout@v4
169169
with:
170170
fetch-depth: 1
171171

@@ -209,7 +209,7 @@ jobs:
209209
timeout-minutes: 7
210210
steps:
211211
- name: Checkout
212-
uses: actions/checkout@v3
212+
uses: actions/checkout@v4
213213
with:
214214
fetch-depth: 1
215215

@@ -248,7 +248,7 @@ jobs:
248248
- windows-2019
249249
steps:
250250
- name: Checkout
251-
uses: actions/checkout@v3
251+
uses: actions/checkout@v4
252252
with:
253253
fetch-depth: 1
254254

@@ -317,7 +317,7 @@ jobs:
317317
timeout-minutes: 25
318318
steps:
319319
- name: Checkout
320-
uses: actions/checkout@v3
320+
uses: actions/checkout@v4
321321
with:
322322
fetch-depth: 1
323323

@@ -365,7 +365,7 @@ jobs:
365365
timeout-minutes: 25
366366
steps:
367367
- name: Checkout
368-
uses: actions/checkout@v3
368+
uses: actions/checkout@v4
369369
with:
370370
fetch-depth: 1
371371

@@ -398,7 +398,7 @@ jobs:
398398
id-token: write
399399
steps:
400400
- name: Checkout
401-
uses: actions/checkout@v3
401+
uses: actions/checkout@v4
402402
with:
403403
fetch-depth: 0
404404

@@ -486,7 +486,7 @@ jobs:
486486
timeout-minutes: 20
487487
steps:
488488
- name: Checkout
489-
uses: actions/checkout@v3
489+
uses: actions/checkout@v4
490490
with:
491491
fetch-depth: 1
492492

@@ -516,7 +516,7 @@ jobs:
516516
timeout-minutes: 20
517517
steps:
518518
- name: Checkout
519-
uses: actions/checkout@v3
519+
uses: actions/checkout@v4
520520
with:
521521
fetch-depth: 1
522522

@@ -582,7 +582,7 @@ jobs:
582582
if: needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true'
583583
steps:
584584
- name: Checkout
585-
uses: actions/checkout@v3
585+
uses: actions/checkout@v4
586586
with:
587587
# Required by Chromatic for build-over-build history, otherwise we
588588
# only get 1 commit on shallow checkout.
@@ -647,7 +647,7 @@ jobs:
647647
if: needs.changes.outputs.offlinedocs == 'true' || needs.changes.outputs.ci == 'true'
648648
steps:
649649
- name: Checkout
650-
uses: actions/checkout@v3
650+
uses: actions/checkout@v4
651651
with:
652652
# 0 is required here for version.sh to work.
653653
fetch-depth: 0
@@ -727,7 +727,7 @@ jobs:
727727
DOCKER_CLI_EXPERIMENTAL: "enabled"
728728
steps:
729729
- name: Checkout
730-
uses: actions/checkout@v3
730+
uses: actions/checkout@v4
731731
with:
732732
fetch-depth: 0
733733

‎.github/workflows/docker-base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
if: github.repository_owner == 'coder'
3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

3737
- name: Docker login
3838
uses: docker/login-action@v2

‎.github/workflows/dogfood.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: buildjet-4vcpu-ubuntu-2204
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
- name: Get branch name
2929
id: branch-name
@@ -61,7 +61,7 @@ jobs:
6161
runs-on: ubuntu-latest
6262
steps:
6363
- name: Checkout
64-
uses: actions/checkout@v3
64+
uses: actions/checkout@v4
6565

6666
- name: Get short commit SHA
6767
id: vars

‎.github/workflows/nightly-gauntlet.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
timeout-minutes: 240
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Setup Go
2323
uses: ./.github/actions/setup-go
@@ -44,7 +44,7 @@ jobs:
4444
timeout-minutes: 10
4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848

4949
- name: Setup Go
5050
uses: ./.github/actions/setup-go

‎.github/workflows/pr-deploy.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
PR_OPEN: ${{ steps.check_pr.outputs.pr_open }}
4949
steps:
5050
- name: Checkout
51-
uses: actions/checkout@v3
51+
uses: actions/checkout@v4
5252

5353
- name: Check if PR is open
5454
id: check_pr
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: "ubuntu-latest"
7979
steps:
8080
- name: Checkout
81-
uses: actions/checkout@v3
81+
uses: actions/checkout@v4
8282
with:
8383
fetch-depth: 0
8484

@@ -202,7 +202,7 @@ jobs:
202202
CODER_IMAGE_TAG: ${{ needs.get_info.outputs.CODER_IMAGE_TAG }}
203203
steps:
204204
- name: Checkout
205-
uses: actions/checkout@v3
205+
uses: actions/checkout@v4
206206
with:
207207
fetch-depth: 0
208208

@@ -296,7 +296,7 @@ jobs:
296296
kubectl create namespace "pr${{ env.PR_NUMBER }}"
297297
298298
- name: Checkout
299-
uses: actions/checkout@v3
299+
uses: actions/checkout@v4
300300

301301
- name: Check and Create Certificate
302302
if: needs.get_info.outputs.NEW == 'true' || github.event.inputs.deploy == 'true'

‎.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
version: ${{ steps.version.outputs.version }}
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444
with:
4545
fetch-depth: 0
4646

@@ -409,7 +409,7 @@ jobs:
409409

410410
steps:
411411
- name: Checkout
412-
uses: actions/checkout@v3
412+
uses: actions/checkout@v4
413413
with:
414414
fetch-depth: 0
415415

@@ -489,7 +489,7 @@ jobs:
489489

490490
steps:
491491
- name: Checkout
492-
uses: actions/checkout@v3
492+
uses: actions/checkout@v4
493493
with:
494494
fetch-depth: 0
495495

‎.github/workflows/security.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030

3131
- name: Initialize CodeQL
3232
uses: github/codeql-action/init@v2
@@ -59,7 +59,7 @@ jobs:
5959
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
6060
steps:
6161
- name: Checkout
62-
uses: actions/checkout@v3
62+
uses: actions/checkout@v4
6363
with:
6464
fetch-depth: 0
6565

‎.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535
steps:
3636
- name: Checkout repository
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3838
- name: Run delete-old-branches-action
3939
uses: beatlabs/delete-old-branches-action@v0.0.10
4040
with:

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ require (
117117
github.com/golang/mock v1.6.0
118118
github.com/google/go-cmp v0.5.9
119119
github.com/google/go-github/v43 v43.0.1-0.20220414155304-00e42332e405
120-
github.com/google/uuid v1.3.0
120+
github.com/google/uuid v1.3.1
121121
github.com/hashicorp/go-multierror v1.1.1
122122
github.com/hashicorp/go-reap v0.0.0-20170704170343-bf58d8a43e7b
123123
github.com/hashicorp/go-version v1.6.0
@@ -184,8 +184,8 @@ require (
184184
golang.org/x/tools v0.13.0
185185
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
186186
golang.zx2c4.com/wireguard v0.0.0-20230325221338-052af4a8072b
187-
google.golang.org/api v0.138.0
188-
google.golang.org/grpc v1.57.0
187+
google.golang.org/api v0.140.0
188+
google.golang.org/grpc v1.58.0
189189
google.golang.org/protobuf v1.31.0
190190
gopkg.in/DataDog/dd-trace-go.v1 v1.54.0
191191
gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -285,7 +285,7 @@ require (
285285
github.com/google/go-querystring v1.1.0 // indirect
286286
github.com/google/nftables v0.1.1-0.20230115205135-9aa6fdf5a28c // indirect
287287
github.com/google/pprof v0.0.0-20230509042627-b1315fad0c5a // indirect
288-
github.com/google/s2a-go v0.1.5 // indirect
288+
github.com/google/s2a-go v0.1.7 // indirect
289289
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
290290
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
291291
github.com/gorilla/css v1.0.0 // indirect
@@ -398,7 +398,7 @@ require (
398398
google.golang.org/appengine v1.6.7 // indirect
399399
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
400400
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
401-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
401+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832 // indirect
402402
gopkg.in/yaml.v2 v2.4.0 // indirect
403403
howett.net/plist v1.0.0 // indirect
404404
inet.af/netaddr v0.0.0-20220811202034-502d2d690317 // indirect

0 commit comments

Comments
 (0)