Skip to content

Commit 773b68b

Browse files
kylecarbskylecarbs
authored
Merge branch 'main' into dependabot/go_modules/github.com/pion/webrtc/v3-3.1.18
2 parents 5b75214 + 91ddb7a commit 773b68b

14 files changed

+37
-16
lines changed

‎.github/stale.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 14
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 5
5+
# Label to apply when stale.
6+
staleLabel: stale
7+
# Comment to post when marking an issue as stale. Set to `false` to disable
8+
markComment: >
9+
This issue has been automatically marked as stale because it has not had
10+
recent activity. It will be closed if no activity occurs in the next 5 days.
11+
# Comment to post when closing a stale issue. Set to `false` to disable
12+
closeComment: false

‎.github/workflows/coder.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ jobs:
168168
-count=1 -race -parallel=1
169169

170170
- uses: codecov/codecov-action@v2
171+
if: github.actor != 'dependabot[bot]'
171172
with:
172173
token: ${{ secrets.CODECOV_TOKEN }}
173174
files: ./gotests.coverage
@@ -200,6 +201,7 @@ jobs:
200201
- run: yarn test:coverage
201202

202203
- uses: codecov/codecov-action@v2
204+
if: github.actor != 'dependabot[bot]'
203205
with:
204206
token: ${{ secrets.CODECOV_TOKEN }}
205207
files: ./coverage/lcov.info

‎coderd/coderd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package coderd
33
import (
44
"net/http"
55

6-
"github.com/go-chi/chi"
6+
"github.com/go-chi/chi/v5"
77

88
"cdr.dev/slog"
99
"github.com/coder/coder/database"

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace github.com/hashicorp/terraform-config-inspect => github.com/kylecarbs/te
77

88
require (
99
cdr.dev/slog v1.4.1
10-
github.com/go-chi/chi v1.5.4
10+
github.com/go-chi/chi/v5 v5.0.7
1111
github.com/go-chi/render v1.0.1
1212
github.com/go-playground/validator/v10 v10.10.0
1313
github.com/golang-migrate/migrate/v4 v4.15.1
@@ -32,7 +32,7 @@ require (
3232
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
3333
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
3434
google.golang.org/protobuf v1.27.1
35-
storj.io/drpc v0.0.28
35+
storj.io/drpc v0.0.29
3636
)
3737

3838
require (

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYis
445445
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
446446
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
447447
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
448-
github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs=
449-
github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg=
448+
github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
449+
github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
450450
github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
451451
github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
452452
github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
@@ -1977,5 +1977,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
19771977
sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
19781978
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
19791979
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
1980-
storj.io/drpc v0.0.28 h1:t8v3Sk7b8NiMIwgKYJCKDyu21x+yCRASOnIpBywl6vs=
1981-
storj.io/drpc v0.0.28/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
1980+
storj.io/drpc v0.0.29 h1:Ihd4ls/JQFr0lctefie3iu+3QM4duccCKr9uMzf4sKY=
1981+
storj.io/drpc v0.0.29/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=

‎httpmw/organizationparam.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"net/http"
99

10-
"github.com/go-chi/chi"
10+
"github.com/go-chi/chi/v5"
1111

1212
"github.com/coder/coder/database"
1313
"github.com/coder/coder/httpapi"

‎httpmw/organizationparam_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/go-chi/chi"
12+
"github.com/go-chi/chi/v5"
1313
"github.com/google/uuid"
1414
"github.com/stretchr/testify/require"
1515

‎httpmw/projectparam.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"net/http"
99

10-
"github.com/go-chi/chi"
10+
"github.com/go-chi/chi/v5"
1111

1212
"github.com/coder/coder/database"
1313
"github.com/coder/coder/httpapi"

‎httpmw/projectparam_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/go-chi/chi"
12+
"github.com/go-chi/chi/v5"
1313
"github.com/google/uuid"
1414
"github.com/stretchr/testify/require"
1515

‎httpmw/userparam.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"net/http"
77

8-
"github.com/go-chi/chi"
8+
"github.com/go-chi/chi/v5"
99

1010
"github.com/coder/coder/database"
1111
"github.com/coder/coder/httpapi"

0 commit comments

Comments
 (0)