Skip to content

Commit 09e0e84

Browse files
authored
Merge branch 'main' into main
2 parents 3df62fc + 9ac5e75 commit 09e0e84

File tree

16 files changed

+492
-106
lines changed

16 files changed

+492
-106
lines changed

.github/workflows/bump-version.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Bump Version
2+
permissions:
3+
contents: write
4+
5+
on:
6+
push:
7+
tags:
8+
- "v[0-9]+.[0-9]+.[0-9]+"
9+
10+
jobs:
11+
bump-version:
12+
name: Bump Version
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v6
17+
18+
- name: Set up Node.js
19+
uses: actions/setup-node@v6
20+
with:
21+
node-version: "24"
22+
23+
- name: Bump version and push tag
24+
uses: ramonpaolo/[email protected]
25+
with:
26+
tag: ${{ github.ref_name }}
27+
commit: true
28+
branch_to_push: "main"

.github/workflows/check-lint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: Check Lint
2+
permissions:
3+
contents: read
24

35
on:
46
push:

.github/workflows/conventional-label.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ on:
22
pull_request_target:
33
types: [opened, edited]
44
name: conventional-release-labels
5+
permissions:
6+
contents: read
7+
pull-requests: write
58
jobs:
69
label:
710
runs-on: ubuntu-latest

.github/workflows/docker-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
touch "/tmp/digests/${digest#sha256:}"
9797
9898
- name: Upload digest
99-
uses: actions/upload-artifact@v5
99+
uses: actions/upload-artifact@v6
100100
with:
101101
name: digests-${{ env.PLATFORM_PAIR }}
102102
path: /tmp/digests/*
@@ -118,7 +118,7 @@ jobs:
118118
- build
119119
steps:
120120
- name: Download digests
121-
uses: actions/download-artifact@v6
121+
uses: actions/download-artifact@v7
122122
with:
123123
path: /tmp/digests
124124
pattern: digests-*

.github/workflows/run-bun-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: Check Tests
2+
permissions:
3+
contents: read
24

35
on:
46
push:

README.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,20 @@ If you get unable to open database file run `chown -R $USER:$USER path` on the p
8585

8686
All are optional, JWT_SECRET is recommended to be set.
8787

88-
| Name | Default | Description |
89-
| ---------------------------- | -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
90-
| JWT_SECRET | when unset it will use the value from randomUUID() | A long and secret string used to sign the JSON Web Token |
91-
| ACCOUNT_REGISTRATION | false | Allow users to register accounts |
92-
| HTTP_ALLOWED | false | Allow HTTP connections, only set this to true locally |
93-
| ALLOW_UNAUTHENTICATED | false | Allow unauthenticated users to use the service, only set this to true locally |
94-
| AUTO_DELETE_EVERY_N_HOURS | 24 | Checks every n hours for files older then n hours and deletes them, set to 0 to disable |
95-
| WEBROOT | | The address to the root path setting this to "/convert" will serve the website on "example.com/convert/" |
96-
| FFMPEG_ARGS | | Arguments to pass to ffmpeg, e.g. `-preset veryfast` |
97-
| HIDE_HISTORY | false | Hide the history page |
98-
| LANGUAGE | en | Language to format date strings in, specified as a [BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag) |
99-
| UNAUTHENTICATED_USER_SHARING | false | Shares conversion history between all unauthenticated users |
100-
| MAX_CONVERT_PROCESS | 0 | Maximum number of concurrent conversion processes allowed. Set to 0 for unlimited. |
88+
| Name | Default | Description |
89+
| ---------------------------- | -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
90+
| JWT_SECRET | when unset it will use the value from randomUUID() | A long and secret string used to sign the JSON Web Token |
91+
| ACCOUNT_REGISTRATION | false | Allow users to register accounts |
92+
| HTTP_ALLOWED | false | Allow HTTP connections, only set this to true locally |
93+
| ALLOW_UNAUTHENTICATED | false | Allow unauthenticated users to use the service, only set this to true locally |
94+
| AUTO_DELETE_EVERY_N_HOURS | 24 | Checks every n hours for files older then n hours and deletes them, set to 0 to disable |
95+
| WEBROOT | | The address to the root path setting this to "/convert" will serve the website on "example.com/convert/" |
96+
| FFMPEG_ARGS | | Arguments to pass to the input file of ffmpeg, e.g. `-hwaccel vaapi`. See https://github.com/C4illin/ConvertX/issues/190 for more info about hw-acceleration. |
97+
| FFMPEG_OUTPUT_ARGS | | Arguments to pass to the output of ffmpeg, e.g. `-preset veryfast` |
98+
| HIDE_HISTORY | false | Hide the history page |
99+
| LANGUAGE | en | Language to format date strings in, specified as a [BCP 47 language tag](https://en.wikipedia.org/wiki/IETF_language_tag) |
100+
| UNAUTHENTICATED_USER_SHARING | false | Shares conversion history between all unauthenticated users |
101+
| MAX_CONVERT_PROCESS | 0 | Maximum number of concurrent conversion processes allowed. Set to 0 for unlimited. |
101102

102103
### Docker images
103104

0 commit comments

Comments
 (0)