Skip to content
This repository was archived by the owner on Feb 15, 2026. It is now read-only.

Commit 36198e8

Browse files
sctsct
committed
Merge branch 'develop'
2 parents 3c65c08 + dc196d4 commit 36198e8

File tree

130 files changed

+10863
-1773
lines changed

Some content is hidden

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

130 files changed

+10863
-1773
lines changed

‎.all-contributorsrc‎

Lines changed: 128 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,8 @@
753753
"avatar_url": "https://avatars.githubusercontent.com/u/18177310?v=4",
754754
"profile": "https://github.com/s0up4200",
755755
"contributions": [
756-
"doc"
756+
"doc",
757+
"code"
757758
]
758759
},
759760
{
@@ -881,6 +882,132 @@
881882
"contributions": [
882883
"code"
883884
]
885+
},
886+
{
887+
"login": "marcofaggian",
888+
"name": "Marco Faggian",
889+
"avatar_url": "https://avatars.githubusercontent.com/u/19221001?v=4",
890+
"profile": "https://marcofaggian.com",
891+
"contributions": [
892+
"code"
893+
]
894+
},
895+
{
896+
"login": "nemchik",
897+
"name": "Eric Nemchik",
898+
"avatar_url": "https://avatars.githubusercontent.com/u/725456?v=4",
899+
"profile": "http://nemchik.com/",
900+
"contributions": [
901+
"code"
902+
]
903+
},
904+
{
905+
"login": "RemiRigal",
906+
"name": "RemiRigal",
907+
"avatar_url": "https://avatars.githubusercontent.com/u/19256051?v=4",
908+
"profile": "https://github.com/RemiRigal",
909+
"contributions": [
910+
"code"
911+
]
912+
},
913+
{
914+
"login": "j0srisk",
915+
"name": "Joseph Risk",
916+
"avatar_url": "https://avatars.githubusercontent.com/u/18372584?v=4",
917+
"profile": "http://josephrisk.com",
918+
"contributions": [
919+
"code"
920+
]
921+
},
922+
{
923+
"login": "Loetwiek",
924+
"name": "Loetwiek",
925+
"avatar_url": "https://avatars.githubusercontent.com/u/79059734?v=4",
926+
"profile": "https://github.com/Loetwiek",
927+
"contributions": [
928+
"code"
929+
]
930+
},
931+
{
932+
"login": "Fuochi",
933+
"name": "Fuochi",
934+
"avatar_url": "https://avatars.githubusercontent.com/u/4720478?v=4",
935+
"profile": "https://github.com/Fuochi",
936+
"contributions": [
937+
"doc"
938+
]
939+
},
940+
{
941+
"login": "demrich",
942+
"name": "David Emrich",
943+
"avatar_url": "https://avatars.githubusercontent.com/u/30092389?v=4",
944+
"profile": "https://github.com/demrich",
945+
"contributions": [
946+
"code"
947+
]
948+
},
949+
{
950+
"login": "maxnatamo",
951+
"name": "Max T. Kristiansen",
952+
"avatar_url": "https://avatars.githubusercontent.com/u/5898152?v=4",
953+
"profile": "https://maxtrier.dk",
954+
"contributions": [
955+
"code"
956+
]
957+
},
958+
{
959+
"login": "DamsDev1",
960+
"name": "Damien Fajole",
961+
"avatar_url": "https://avatars.githubusercontent.com/u/60252259?v=4",
962+
"profile": "https://damsdev.me",
963+
"contributions": [
964+
"code"
965+
]
966+
},
967+
{
968+
"login": "AhmedNSidd",
969+
"name": "Ahmed Siddiqui",
970+
"avatar_url": "https://avatars.githubusercontent.com/u/36286128?v=4",
971+
"profile": "https://github.com/AhmedNSidd",
972+
"contributions": [
973+
"code"
974+
]
975+
},
976+
{
977+
"login": "JackW6809",
978+
"name": "JackOXI",
979+
"avatar_url": "https://avatars.githubusercontent.com/u/53652452?v=4",
980+
"profile": "https://github.com/JackW6809",
981+
"contributions": [
982+
"code"
983+
]
984+
},
985+
{
986+
"login": "StancuFlorin",
987+
"name": "Stancu Florin",
988+
"avatar_url": "https://avatars.githubusercontent.com/u/1199404?v=4",
989+
"profile": "http://indicus.ro",
990+
"contributions": [
991+
"code"
992+
]
993+
},
994+
{
995+
"login": "lmiklosko",
996+
"name": "Lukas Miklosko",
997+
"avatar_url": "https://avatars.githubusercontent.com/u/44380311?v=4",
998+
"profile": "https://github.com/lmiklosko",
999+
"contributions": [
1000+
"code"
1001+
]
1002+
},
1003+
{
1004+
"login": "gauthier-th",
1005+
"name": "Gauthier",
1006+
"avatar_url": "https://avatars.githubusercontent.com/u/37781713?v=4",
1007+
"profile": "https://gauthierth.fr/",
1008+
"contributions": [
1009+
"code"
1010+
]
8841011
}
8851012
],
8861013
"badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",

‎.gitattributes‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,24 @@
2424
*.woff binary
2525
*.pyc binary
2626
*.pdf binary
27+
28+
#
29+
## Theses files/directories should be excluded from git archives
30+
#
31+
32+
.husky export-ignore
33+
.vscode export-ignore
34+
docs export-ignore
35+
36+
.git* export-ignore
37+
*ignore export-ignore
38+
*.md export-ignore
39+
40+
.all-contributorsrc export-ignore
41+
.editorconfig export-ignore
42+
Dockerfile.local export-ignore
43+
docker-compose.yml export-ignore
44+
stylelint.config.js export-ignore
45+
46+
public/os_logo_filled.png export-ignore
47+
public/preview.jpg export-ignore

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
test:
1313
name: Lint & Test Build
1414
if: github.event_name == 'pull_request'
15-
runs-on: ubuntu-20.04
16-
container: node:16.17-alpine
15+
runs-on: ubuntu-22.04
16+
container: node:18.18-alpine
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v3
@@ -31,21 +31,14 @@ jobs:
3131
build_and_push:
3232
name: Build & Publish Docker Images
3333
if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
34-
runs-on: ubuntu-20.04
34+
runs-on: ubuntu-22.04
3535
steps:
3636
- name: Checkout
3737
uses: actions/checkout@v3
3838
- name: Set up QEMU
3939
uses: docker/setup-qemu-action@v2
4040
- name: Set up Docker Buildx
4141
uses: docker/setup-buildx-action@v2
42-
- name: Cache Docker layers
43-
uses: actions/cache@v3
44-
with:
45-
path: /tmp/.buildx-cache
46-
key: ${{ runner.os }}-buildx-${{ github.sha }}
47-
restore-keys: |
48-
${{ runner.os }}-buildx-
4942
- name: Log in to Docker Hub
5043
uses: docker/login-action@v2
5144
with:
@@ -71,21 +64,12 @@ jobs:
7164
sctx/overseerr:${{ github.sha }}
7265
ghcr.io/sct/overseerr:develop
7366
ghcr.io/sct/overseerr:${{ github.sha }}
74-
cache-from: type=local,src=/tmp/.buildx-cache
75-
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
76-
- # Temporary fix
77-
# https://github.com/docker/build-push-action/issues/252
78-
# https://github.com/moby/buildkit/issues/1896
79-
name: Move cache
80-
run: |
81-
rm -rf /tmp/.buildx-cache
82-
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
8367
8468
discord:
8569
name: Send Discord Notification
8670
needs: build_and_push
8771
if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]')
88-
runs-on: ubuntu-20.04
72+
runs-on: ubuntu-22.04
8973
steps:
9074
- name: Get Build Job Status
9175
uses: technote-space/workflow-conclusion-action@v3

‎.github/workflows/deploy_docs.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@ on:
88
jobs:
99
deploy:
1010
runs-on: ubuntu-latest
11+
permissions:
12+
contents: write
1113
steps:
1214
- uses: actions/checkout@v3
1315
- name: Generate Swagger UI
1416
uses: Legion2/swagger-ui-action@v1
1517
with:
1618
output: swagger-ui
1719
spec-file: overseerr-api.yml
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1821
- name: Deploy to GitHub Pages
19-
uses: peaceiris/actions-gh-pages@v3
22+
uses: peaceiris/actions-gh-pages@v4
2023
with:
2124
github_token: ${{ secrets.GITHUB_TOKEN }}
2225
publish_dir: swagger-ui

‎.github/workflows/preview.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
build_and_push:
1010
name: Build & Publish Docker Preview Images
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v3

‎.github/workflows/release.yml‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -44,66 +44,66 @@ jobs:
4444
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
4545
run: npx semantic-release
4646

47-
build-snap:
48-
name: Build Snap Package (${{ matrix.architecture }})
49-
needs: semantic-release
50-
runs-on: ubuntu-20.04
51-
strategy:
52-
fail-fast: false
53-
matrix:
54-
architecture:
55-
- amd64
56-
- arm64
57-
- armhf
58-
steps:
59-
- name: Checkout Code
60-
uses: actions/checkout@v3
61-
with:
62-
fetch-depth: 0
63-
- name: Switch to master branch
64-
run: git checkout master
65-
- name: Pull latest changes
66-
run: git pull
67-
- name: Prepare
68-
id: prepare
69-
run: |
70-
git fetch --prune --tags
71-
if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
72-
echo "RELEASE=stable" >> $GITHUB_OUTPUT
73-
else
74-
echo "RELEASE=edge" >> $GITHUB_OUTPUT
75-
fi
76-
- name: Set Up QEMU
77-
uses: docker/setup-qemu-action@v2
78-
with:
79-
image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
80-
- name: Build Snap Package
81-
uses: diddlesnaps/snapcraft-multiarch-action@v1
82-
id: build
83-
with:
84-
architecture: ${{ matrix.architecture }}
85-
- name: Upload Snap Package
86-
uses: actions/upload-artifact@v3
87-
with:
88-
name: overseerr-snap-package-${{ matrix.architecture }}
89-
path: ${{ steps.build.outputs.snap }}
90-
- name: Review Snap Package
91-
uses: diddlesnaps/snapcraft-review-tools-action@v1
92-
with:
93-
snap: ${{ steps.build.outputs.snap }}
94-
- name: Publish Snap Package
95-
uses: snapcore/action-publish@v1
96-
env:
97-
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
98-
with:
99-
snap: ${{ steps.build.outputs.snap }}
100-
release: ${{ steps.prepare.outputs.RELEASE }}
47+
# build-snap:
48+
# name: Build Snap Package (${{ matrix.architecture }})
49+
# needs: semantic-release
50+
# runs-on: ubuntu-22.04
51+
# strategy:
52+
# fail-fast: false
53+
# matrix:
54+
# architecture:
55+
# - amd64
56+
# - arm64
57+
# - armhf
58+
# steps:
59+
# - name: Checkout Code
60+
# uses: actions/checkout@v3
61+
# with:
62+
# fetch-depth: 0
63+
# - name: Switch to master branch
64+
# run: git checkout master
65+
# - name: Pull latest changes
66+
# run: git pull
67+
# - name: Prepare
68+
# id: prepare
69+
# run: |
70+
# git fetch --prune --tags
71+
# if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
72+
# echo "RELEASE=stable" >> $GITHUB_OUTPUT
73+
# else
74+
# echo "RELEASE=edge" >> $GITHUB_OUTPUT
75+
# fi
76+
# - name: Set Up QEMU
77+
# uses: docker/setup-qemu-action@v2
78+
# with:
79+
# image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
80+
# - name: Build Snap Package
81+
# uses: diddlesnaps/snapcraft-multiarch-action@v1
82+
# id: build
83+
# with:
84+
# architecture: ${{ matrix.architecture }}
85+
# - name: Upload Snap Package
86+
# uses: actions/upload-artifact@v3
87+
# with:
88+
# name: overseerr-snap-package-${{ matrix.architecture }}
89+
# path: ${{ steps.build.outputs.snap }}
90+
# - name: Review Snap Package
91+
# uses: diddlesnaps/snapcraft-review-tools-action@v1
92+
# with:
93+
# snap: ${{ steps.build.outputs.snap }}
94+
# - name: Publish Snap Package
95+
# uses: snapcore/action-publish@v1
96+
# env:
97+
# SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
98+
# with:
99+
# snap: ${{ steps.build.outputs.snap }}
100+
# release: ${{ steps.prepare.outputs.RELEASE }}
101101

102102
discord:
103103
name: Send Discord Notification
104104
needs: semantic-release
105105
if: always()
106-
runs-on: ubuntu-20.04
106+
runs-on: ubuntu-22.04
107107
steps:
108108
- name: Get Build Job Status
109109
uses: technote-space/workflow-conclusion-action@v3

0 commit comments

Comments
 (0)