Skip to content

Commit e9545d4

Browse files
sctsct
committed
Merge branch 'develop' into feature/plex-decouple
2 parents 6f5f615 + 1e2c6f4 commit e9545d4

File tree

191 files changed

+13084
-5027
lines changed

Some content is hidden

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

191 files changed

+13084
-5027
lines changed

‎.all-contributorsrc‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,42 @@
755755
"contributions": [
756756
"doc"
757757
]
758+
},
759+
{
760+
"login": "ceptonit",
761+
"name": "ceptonit",
762+
"avatar_url": "https://avatars.githubusercontent.com/u/12678743?v=4",
763+
"profile": "https://github.com/ceptonit",
764+
"contributions": [
765+
"doc"
766+
]
767+
},
768+
{
769+
"login": "aedelbro",
770+
"name": "aedelbro",
771+
"avatar_url": "https://avatars.githubusercontent.com/u/36162221?v=4",
772+
"profile": "https://github.com/aedelbro",
773+
"contributions": [
774+
"code"
775+
]
776+
},
777+
{
778+
"login": "lunks",
779+
"name": "Pedro Nascimento",
780+
"avatar_url": "https://avatars.githubusercontent.com/u/91118?v=4",
781+
"profile": "http://twitter.com/lunks/",
782+
"contributions": [
783+
"code"
784+
]
785+
},
786+
{
787+
"login": "owenvoke",
788+
"name": "Owen Voke",
789+
"avatar_url": "https://avatars.githubusercontent.com/u/1899334?v=4",
790+
"profile": "https://voke.dev",
791+
"contributions": [
792+
"code"
793+
]
758794
}
759795
],
760796
"badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",

‎.github/holopin.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
organization: overseerr
2+
defaultSticker: clcyagj1j329008l468ya8pu2
3+
stickers:
4+
- id: clcyagj1j329008l468ya8pu2
5+
alias: overseerr-contributor

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ jobs:
9494
run: |
9595
failures=(neutral, skipped, timed_out, action_required)
9696
if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
97-
echo ::set-output name=status::failure
97+
echo "status=failure" >> $GITHUB_OUTPUT
9898
else
99-
echo ::set-output name=status::$WORKFLOW_CONCLUSION
99+
echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
100100
fi
101101
- name: Post Status to Discord
102102
uses: sarisia/actions-status-discord@v1

‎.github/workflows/codeql.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: 'CodeQL'
2+
3+
on:
4+
push:
5+
branches: ['develop']
6+
pull_request:
7+
branches: ['develop']
8+
schedule:
9+
- cron: '50 7 * * 5'
10+
11+
jobs:
12+
analyze:
13+
name: Analyze
14+
runs-on: ubuntu-latest
15+
permissions:
16+
actions: read
17+
contents: read
18+
security-events: write
19+
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
language: [javascript]
24+
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@v3
28+
29+
- name: Initialize CodeQL
30+
uses: github/codeql-action/init@v2
31+
with:
32+
languages: ${{ matrix.language }}
33+
queries: +security-and-quality
34+
35+
- name: Autobuild
36+
uses: github/codeql-action/autobuild@v2
37+
38+
- name: Perform CodeQL Analysis
39+
uses: github/codeql-action/analyze@v2
40+
with:
41+
category: '/language:${{ matrix.language }}'

‎.github/workflows/preview.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v3
1515
- name: Get the version
1616
id: get_version
17-
run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
17+
run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
1818
- name: Set up QEMU
1919
uses: docker/setup-qemu-action@v2
2020
- name: Set up Docker Buildx

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ jobs:
6767
run: |
6868
git fetch --prune --tags
6969
if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
70-
echo ::set-output name=RELEASE::stable
70+
echo "RELEASE=stable" >> $GITHUB_OUTPUT
7171
else
72-
echo ::set-output name=RELEASE::edge
72+
echo "RELEASE=edge" >> $GITHUB_OUTPUT
7373
fi
7474
- name: Set Up QEMU
7575
uses: docker/setup-qemu-action@v2
@@ -91,8 +91,9 @@ jobs:
9191
snap: ${{ steps.build.outputs.snap }}
9292
- name: Publish Snap Package
9393
uses: snapcore/action-publish@v1
94+
env:
95+
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
9496
with:
95-
store_login: ${{ secrets.SNAP_LOGIN }}
9697
snap: ${{ steps.build.outputs.snap }}
9798
release: ${{ steps.prepare.outputs.RELEASE }}
9899

@@ -109,9 +110,9 @@ jobs:
109110
run: |
110111
failures=(neutral, skipped, timed_out, action_required)
111112
if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
112-
echo ::set-output name=status::failure
113+
echo "status=failure" >> $GITHUB_OUTPUT
113114
else
114-
echo ::set-output name=status::$WORKFLOW_CONCLUSION
115+
echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
115116
fi
116117
- name: Post Status to Discord
117118
uses: sarisia/actions-status-discord@v1

‎.github/workflows/snap.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ jobs:
3535
run: |
3636
git fetch --prune --unshallow --tags
3737
if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
38-
echo ::set-output name=RELEASE::stable
38+
echo "RELEASE=stable" >> $GITHUB_OUTPUT
3939
else
40-
echo ::set-output name=RELEASE::edge
40+
echo "RELEASE=edge" >> $GITHUB_OUTPUT
4141
fi
4242
- name: Set Up QEMU
4343
uses: docker/setup-qemu-action@v2
@@ -57,8 +57,9 @@ jobs:
5757
snap: ${{ steps.build.outputs.snap }}
5858
- name: Publish Snap Package
5959
uses: snapcore/action-publish@v1
60+
env:
61+
SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
6062
with:
61-
store_login: ${{ secrets.SNAP_LOGIN }}
6263
snap: ${{ steps.build.outputs.snap }}
6364
release: ${{ steps.prepare.outputs.RELEASE }}
6465

@@ -75,9 +76,9 @@ jobs:
7576
run: |
7677
failures=(neutral, skipped, timed_out, action_required)
7778
if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
78-
echo ::set-output name=status::failure
79+
echo "status=failure" >> $GITHUB_OUTPUT
7980
else
80-
echo ::set-output name=status::$WORKFLOW_CONCLUSION
81+
echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
8182
fi
8283
- name: Post Status to Discord
8384
uses: sarisia/actions-status-discord@v1

0 commit comments

Comments
 (0)