Skip to content

Commit 73c7ff2

Browse files
committed
chore: prepare for 2.4.0
2 parents 0bb2ee0 + 0113612 commit 73c7ff2

File tree

143 files changed

+7618
-3778
lines changed

Some content is hidden

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

143 files changed

+7618
-3778
lines changed

.all-contributorsrc

Lines changed: 122 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",
88
"contributorsPerLine": 7,
99
"projectName": "jellyseerr",
10-
"projectOwner": "Fallenbagel",
10+
"projectOwner": "fallenbagel",
1111
"repoType": "github",
1212
"repoHost": "https://github.com",
1313
"skipCi": true,
@@ -94,7 +94,8 @@
9494
"avatar_url": "https://avatars.githubusercontent.com/u/345752?v=4",
9595
"profile": "https://github.com/jab416171",
9696
"contributions": [
97-
"doc"
97+
"doc",
98+
"code"
9899
]
99100
},
100101
{
@@ -338,7 +339,8 @@
338339
"avatar_url": "https://avatars.githubusercontent.com/u/37781713?v=4",
339340
"profile": "https://gauthierth.fr/",
340341
"contributions": [
341-
"code"
342+
"code",
343+
"maintenance"
342344
]
343345
},
344346
{
@@ -592,6 +594,123 @@
592594
"contributions": [
593595
"infra"
594596
]
597+
},
598+
{
599+
"login": "andrewkolda",
600+
"name": "andrewkolda",
601+
"avatar_url": "https://avatars.githubusercontent.com/u/158614532?v=4",
602+
"profile": "https://github.com/andrewkolda",
603+
"contributions": [
604+
"design"
605+
]
606+
},
607+
{
608+
"login": "ishanjain28",
609+
"name": "Ishan Jain",
610+
"avatar_url": "https://avatars.githubusercontent.com/u/7921368?v=4",
611+
"profile": "https://ishanjain.me",
612+
"contributions": [
613+
"code"
614+
]
615+
},
616+
{
617+
"login": "michaelhthomas",
618+
"name": "Michael Thomas",
619+
"avatar_url": "https://avatars.githubusercontent.com/u/18223295?v=4",
620+
"profile": "http://michaelt.xyz",
621+
"contributions": [
622+
"code"
623+
]
624+
},
625+
{
626+
"login": "j0srisk",
627+
"name": "Joseph Risk",
628+
"avatar_url": "https://avatars.githubusercontent.com/u/18372584?v=4",
629+
"profile": "http://josephrisk.com",
630+
"contributions": [
631+
"code"
632+
]
633+
},
634+
{
635+
"login": "Loetwiek",
636+
"name": "Loetwiek",
637+
"avatar_url": "https://avatars.githubusercontent.com/u/79059734?v=4",
638+
"profile": "https://github.com/Loetwiek",
639+
"contributions": [
640+
"code"
641+
]
642+
},
643+
{
644+
"login": "Fuochi",
645+
"name": "Fuochi",
646+
"avatar_url": "https://avatars.githubusercontent.com/u/4720478?v=4",
647+
"profile": "https://github.com/Fuochi",
648+
"contributions": [
649+
"doc"
650+
]
651+
},
652+
{
653+
"login": "demrich",
654+
"name": "David Emrich",
655+
"avatar_url": "https://avatars.githubusercontent.com/u/30092389?v=4",
656+
"profile": "https://github.com/demrich",
657+
"contributions": [
658+
"code"
659+
]
660+
},
661+
{
662+
"login": "maxnatamo",
663+
"name": "Max T. Kristiansen",
664+
"avatar_url": "https://avatars.githubusercontent.com/u/5898152?v=4",
665+
"profile": "https://maxtrier.dk",
666+
"contributions": [
667+
"code"
668+
]
669+
},
670+
{
671+
"login": "DamsDev1",
672+
"name": "Damien Fajole",
673+
"avatar_url": "https://avatars.githubusercontent.com/u/60252259?v=4",
674+
"profile": "https://damsdev.me",
675+
"contributions": [
676+
"code"
677+
]
678+
},
679+
{
680+
"login": "AhmedNSidd",
681+
"name": "Ahmed Siddiqui",
682+
"avatar_url": "https://avatars.githubusercontent.com/u/36286128?v=4",
683+
"profile": "https://github.com/AhmedNSidd",
684+
"contributions": [
685+
"code"
686+
]
687+
},
688+
{
689+
"login": "JackW6809",
690+
"name": "JackOXI",
691+
"avatar_url": "https://avatars.githubusercontent.com/u/53652452?v=4",
692+
"profile": "https://github.com/JackW6809",
693+
"contributions": [
694+
"code"
695+
]
696+
},
697+
{
698+
"login": "StancuFlorin",
699+
"name": "Stancu Florin",
700+
"avatar_url": "https://avatars.githubusercontent.com/u/1199404?v=4",
701+
"profile": "http://indicus.ro",
702+
"contributions": [
703+
"code"
704+
]
705+
},
706+
{
707+
"login": "RankWeis",
708+
"name": "RankWeis",
709+
"avatar_url": "https://avatars.githubusercontent.com/u/733691?v=4",
710+
"profile": "https://github.com/RankWeis",
711+
"contributions": [
712+
"code"
713+
]
595714
}
596715
]
597716
}

.github/workflows/ci.yml

Lines changed: 73 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
test:
1313
name: Lint & Test Build
1414
if: github.event_name == 'pull_request'
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-24.04
1616
container: node:22-alpine
1717
steps:
1818
- name: Checkout
@@ -43,15 +43,23 @@ jobs:
4343
- name: Build
4444
run: pnpm build
4545

46-
build_and_push:
46+
build:
4747
name: Build & Publish Docker Images
4848
if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
49-
runs-on: ubuntu-22.04
49+
strategy:
50+
matrix:
51+
include:
52+
- runner: ubuntu-24.04
53+
platform: linux/amd64
54+
- runner: ubuntu-24.04-arm
55+
platform: linux/arm64
56+
runs-on: ${{ matrix.runner }}
57+
outputs:
58+
digest-amd64: ${{ steps.set_outputs.outputs.digest-amd64 }}
59+
digest-arm64: ${{ steps.set_outputs.outputs.digest-arm64 }}
5060
steps:
5161
- name: Checkout
5262
uses: actions/checkout@v4
53-
- name: Set up QEMU
54-
uses: docker/setup-qemu-action@v3
5563
- name: Set up Docker Buildx
5664
uses: docker/setup-buildx-action@v3
5765
- name: Log in to Docker Hub
@@ -70,24 +78,77 @@ jobs:
7078
echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
7179
env:
7280
OWNER: ${{ github.repository_owner }}
73-
- name: Build and push
81+
- name: Docker metadata
82+
id: meta
83+
uses: docker/metadata-action@v4
84+
with:
85+
images: |
86+
fallenbagel/jellyseerr
87+
ghcr.io/${{ env.OWNER_LC }}/jellyseerr
88+
tags: |
89+
type=ref,event=branch
90+
type=sha,prefix=,suffix=,format=short
91+
- name: Build and push by digest
92+
id: build
7493
uses: docker/build-push-action@v5
7594
with:
7695
context: .
7796
file: ./Dockerfile
78-
platforms: linux/amd64,linux/arm64
97+
platforms: ${{ matrix.platform }}
7998
push: true
8099
build-args: |
81100
COMMIT_TAG=${{ github.sha }}
82-
tags: |
83-
fallenbagel/jellyseerr:develop
84-
ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop
101+
outputs: |
102+
type=image,push-by-digest=true,name=fallenbagel/jellyseerr,push=true
103+
type=image,push-by-digest=true,name=ghcr.io/${{ env.OWNER_LC }}/jellyseerr,push=true
104+
cache-from: type=gha,scope=${{ matrix.platform }}
105+
cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
106+
provenance: false
107+
- name: Set outputs
108+
id: set_outputs
109+
run: |
110+
platform="${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}"
111+
echo "digest-${platform}=${{ steps.build.outputs.digest }}" >> $GITHUB_OUTPUT
112+
113+
merge_and_push:
114+
name: Create and Push Multi-arch Manifest
115+
needs: build
116+
runs-on: ubuntu-24.04
117+
steps:
118+
- name: Log in to Docker Hub
119+
uses: docker/login-action@v3
120+
with:
121+
username: ${{ secrets.DOCKER_USERNAME }}
122+
password: ${{ secrets.DOCKER_TOKEN }}
123+
- name: Log in to GitHub Container Registry
124+
uses: docker/login-action@v3
125+
with:
126+
registry: ghcr.io
127+
username: ${{ github.repository_owner }}
128+
password: ${{ secrets.GITHUB_TOKEN }}
129+
- name: Set lower case owner name
130+
run: |
131+
echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
132+
env:
133+
OWNER: ${{ github.repository_owner }}
134+
- name: Create and push manifest
135+
run: |
136+
docker manifest create fallenbagel/jellyseerr:develop \
137+
--amend fallenbagel/jellyseerr@${{ needs.build.outputs.digest-amd64 }} \
138+
--amend fallenbagel/jellyseerr@${{ needs.build.outputs.digest-arm64 }}
139+
docker manifest push fallenbagel/jellyseerr:develop
140+
141+
# GHCR manifest
142+
docker manifest create ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop \
143+
--amend ghcr.io/${{ env.OWNER_LC }}/jellyseerr@${{ needs.build.outputs.digest-amd64 }} \
144+
--amend ghcr.io/${{ env.OWNER_LC }}/jellyseerr@${{ needs.build.outputs.digest-arm64 }}
145+
docker manifest push ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop
85146
86147
discord:
87148
name: Send Discord Notification
88-
needs: build_and_push
149+
needs: merge_and_push
89150
if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]')
90-
runs-on: ubuntu-22.04
151+
runs-on: ubuntu-24.04
91152
steps:
92153
- name: Get Build Job Status
93154
uses: technote-space/workflow-conclusion-action@v3

.github/workflows/cypress.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,10 @@ jobs:
3636
# Fix test titles in cypress dashboard
3737
COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
3838
COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}
39+
- name: Upload video files
40+
uses: actions/upload-artifact@v4
41+
with:
42+
name: cypress-videos
43+
path: |
44+
cypress/videos
45+
cypress/screenshots

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ When adding new UI text, please try to adhere to the following guidelines:
9797

9898
## Translation
9999

100-
We use [Weblate](https://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/) for our translations, and your help with localizing Overseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/fallenbagel/jellyseerr/issues/new/choose).
100+
We use [Weblate](https://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/) for our translations, and your help with localizing Jellyseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/fallenbagel/jellyseerr/issues/new/choose).
101101

102102
<a href="https://jellyseerr.borgcube.de/engage/jellysseerr/"><img src="https://jellyseerr.borgcube.de/widget/jellyseerr/multi-auto.svg" alt="Translation status" /></a>
103103

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN \
1414
;; \
1515
esac
1616

17-
RUN npm install --global pnpm
17+
RUN npm install --global pnpm@9
1818

1919
COPY package.json pnpm-lock.yaml postinstall-win.js ./
2020
RUN CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
@@ -29,7 +29,7 @@ RUN pnpm build
2929
# remove development dependencies
3030
RUN pnpm prune --prod --ignore-scripts
3131

32-
RUN rm -rf src server .next/cache
32+
RUN rm -rf src server .next/cache charts gen-docs docs
3333

3434
RUN touch config/DOCKER
3535

@@ -45,7 +45,7 @@ WORKDIR /app
4545

4646
RUN apk add --no-cache tzdata tini && rm -rf /tmp/*
4747

48-
RUN npm install -g pnpm
48+
RUN npm install -g pnpm@9
4949

5050
# copy from build image
5151
COPY --from=BUILD_IMAGE /app ./

Dockerfile.local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM node:22-alpine
33
COPY . /app
44
WORKDIR /app
55

6-
Run npm install --global pnpm
6+
RUN npm install --global pnpm@9
77

88
RUN pnpm install
99

0 commit comments

Comments
 (0)