Skip to content

Commit adf1177

Browse files
Merge branch 'autobrr:main' into feat/oidc-authentication
2 parents 4d73905 + 1c8fa3d commit adf1177

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

.github/workflows/vuln.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
env:
16-
GOVULNCHECK_VERSION: v1.3.0
17-
OSV_SCANNER_VERSION: v2.3.8
16+
GOVULNCHECK_VERSION: v1.6.0
17+
OSV_SCANNER_VERSION: v2.4.0
1818

1919
jobs:
2020
vuln:
@@ -36,4 +36,5 @@ jobs:
3636
run: go run golang.org/x/vuln/cmd/govulncheck@${GOVULNCHECK_VERSION} ./...
3737

3838
- name: Run OSV dependency scan
39+
if: ${{ !cancelled() }}
3940
run: go run github.com/google/osv-scanner/v2/cmd/osv-scanner@${OSV_SCANNER_VERSION} scan source --lockfile go.mod --lockfile gui/frontend/pnpm-lock.yaml

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# below. The predefined platform args (BUILDPLATFORM, TARGET*) are auto-available
55
# to FROM, and VERSION/BUILD_ID are declared inside the build stage where they are
66
# consumed (see below), so they do not need global declarations.
7-
ARG GO_VERSION=1.26.4
7+
ARG GO_VERSION=1.26.5
88

99
FROM --platform=$BUILDPLATFORM node:20-alpine AS frontend
1010

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/autobrr/upbrr
22

3-
go 1.26.4
3+
go 1.26.5
44

55
require (
66
github.com/anacrolix/torrent v1.61.0
77
github.com/autobrr/go-bdinfo v0.3.2-0.20260630110520-88d4a8ab6880
8-
github.com/autobrr/go-mediainfo v0.4.1-0.20260713062236-a80a455cd7e0
8+
github.com/autobrr/go-mediainfo v0.4.1-0.20260719223324-57c6f92129f4
99
github.com/autobrr/go-qbittorrent v1.16.0
1010
github.com/autobrr/mkbrr v1.23.0
1111
github.com/coreos/go-oidc/v3 v3.19.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ github.com/anacrolix/torrent v1.61.0/go.mod h1:yKUKuZSSDdyOsCbuH+rDOpswl/g546gIC
4646
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
4747
github.com/autobrr/go-bdinfo v0.3.2-0.20260630110520-88d4a8ab6880 h1:p55pQampC+aNv9krb63Yw4WnhOf2KTIFt2SgbR2QDpk=
4848
github.com/autobrr/go-bdinfo v0.3.2-0.20260630110520-88d4a8ab6880/go.mod h1:LvWQ9miDSoeSvJ2vyttB1pYicDl5+eTZ5snvqH7OmZA=
49-
github.com/autobrr/go-mediainfo v0.4.1-0.20260713062236-a80a455cd7e0 h1:ddJeUxX8QHw1+g7x4yCzNCohF/R4mrZerun0uN83Cyw=
50-
github.com/autobrr/go-mediainfo v0.4.1-0.20260713062236-a80a455cd7e0/go.mod h1:xVXgHDAYYpIeGQCQCdTBpoiY/O3tojJfflK+rrbzclQ=
49+
github.com/autobrr/go-mediainfo v0.4.1-0.20260719223324-57c6f92129f4 h1:YqbaLPpLCxZgt442jWS6Z0q4OLelAuQ3yNL+8cPw2m4=
50+
github.com/autobrr/go-mediainfo v0.4.1-0.20260719223324-57c6f92129f4/go.mod h1:xVXgHDAYYpIeGQCQCdTBpoiY/O3tojJfflK+rrbzclQ=
5151
github.com/autobrr/go-qbittorrent v1.16.0 h1:H0zwzLOaCxvJTxJ3xe4+hV3rFSuxucsgKQxsGHydXCU=
5252
github.com/autobrr/go-qbittorrent v1.16.0/go.mod h1:s36a75VlatWPpHI+pNg4Ta6eB3fRxQvTZPfgMtOsQfY=
5353
github.com/autobrr/mkbrr v1.23.0 h1:g9RhZqT78u9726ifDt+KP8VhPNNm1pxmL8Y4L9wa2yk=

0 commit comments

Comments
 (0)