Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Combined dependabot PR #4247

Merged
merged 29 commits into from
Dec 28, 2023
Merged

Combined dependabot PR #4247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b3eeece
Bump github.com/gorilla/websocket from 1.5.0 to 1.5.1
dependabot[bot] Nov 30, 2023
a7126f2
Bump webpack-merge from 5.8.0 to 5.10.0 in /web
dependabot[bot] Nov 30, 2023
4153770
Bump autoprefixer from 9.8.5 to 9.8.8 in /web
dependabot[bot] Nov 30, 2023
0f9008d
Bump @adobe/css-tools from 4.3.1 to 4.3.2 in /web
dependabot[bot] Nov 30, 2023
84180a3
Bump monaco-editor from 0.33.0 to 0.45.0 in /web
dependabot[bot] Dec 8, 2023
b7e7202
Bump k8s.io/client-go from 0.28.4 to 0.29.0 in /kurl_proxy
dependabot[bot] Dec 14, 2023
034996d
Bump actions/setup-go from 4 to 5
dependabot[bot] Dec 14, 2023
6aa853b
Bump actions/download-artifact from 3 to 4
dependabot[bot] Dec 18, 2023
fdd8fcd
Bump github/codeql-action from 2 to 3
dependabot[bot] Dec 18, 2023
e8c3d87
Bump actions/upload-artifact from 3 to 4
dependabot[bot] Dec 18, 2023
9a4ac1d
Bump golang.org/x/crypto from 0.14.0 to 0.17.0
dependabot[bot] Dec 18, 2023
e7b7d75
Bump golang.org/x/crypto in /.github/actions/copy-assets
dependabot[bot] Dec 18, 2023
8c88c8f
Bump github.com/containerd/containerd from 1.7.7 to 1.7.11
dependabot[bot] Dec 19, 2023
79d4145
Merge remote-tracking branch 'origin/dependabot/go_modules/github.com…
laverya Dec 28, 2023
b3e1126
Merge remote-tracking branch 'origin/dependabot/go_modules/kurl_proxy…
laverya Dec 28, 2023
cf2af85
Merge remote-tracking branch 'origin/dependabot/go_modules/golang.org…
laverya Dec 28, 2023
baa834b
Merge remote-tracking branch 'origin/dependabot/go_modules/dot-github…
laverya Dec 28, 2023
5def3db
Merge remote-tracking branch 'origin/dependabot/go_modules/github.com…
laverya Dec 28, 2023
311be02
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
laverya Dec 28, 2023
9047cda
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
laverya Dec 28, 2023
25afd8c
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
laverya Dec 28, 2023
82ab098
Merge remote-tracking branch 'origin/dependabot/github_actions/github…
laverya Dec 28, 2023
8ed055e
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/web/webp…
laverya Dec 28, 2023
d09d48c
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/web/auto…
laverya Dec 28, 2023
c3ee29f
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/web/adob…
laverya Dec 28, 2023
57462b1
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/web/mona…
laverya Dec 28, 2023
e685c70
bump github.com/go-git/go-git/v5
laverya Dec 28, 2023
657e3c9
bump golang.org/x/crypto in /kurl_proxy
laverya Dec 28, 2023
82bd07e
go mod tidy
laverya Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/copy-assets/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
require (
github.com/golang/protobuf v1.4.2 // indirect
github.com/google/go-querystring v1.1.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/net v0.18.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.25.0 // indirect
Expand Down
5 changes: 4 additions & 1 deletion .github/actions/copy-assets/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,9 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down Expand Up @@ -247,11 +248,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/alpha.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
ignore-unfixed: true
severity: 'CRITICAL,HIGH,MEDIUM'
- name: Upload scan report
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: rqlite-scan-output.sarif

Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
severity: 'CRITICAL,HIGH,MEDIUM'

- name: Upload scan report
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'minio-scan-output.sarif'

Expand All @@ -140,7 +140,7 @@ jobs:
ignore-unfixed: true
severity: 'CRITICAL,HIGH,MEDIUM'
- name: Upload scan report
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: dex-scan-output.sarif

Expand All @@ -163,7 +163,7 @@ jobs:
ignore-unfixed: true
severity: 'CRITICAL,HIGH,MEDIUM'
- name: Upload scan report
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: kurl-proxy-scan-output.sarif

Expand All @@ -190,7 +190,7 @@ jobs:
ignore-unfixed: true
severity: 'CRITICAL,HIGH,MEDIUM'
- name: Upload scan report
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: scan-output.sarif

Expand All @@ -213,7 +213,7 @@ jobs:
ignore-unfixed: true
severity: 'CRITICAL,HIGH,MEDIUM'
- name: Upload scan report
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: kotsadm-scan-output.sarif

Expand All @@ -236,6 +236,6 @@ jobs:
ignore-unfixed: true
severity: 'CRITICAL,HIGH,MEDIUM'
- name: Upload scan report
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: kotsadm-migration-scan-output.sarif
Loading
Loading