Skip to content

Commit 93071e4

Browse files
authored
chore: Merge branch dev to main (#206)
2 parents c71cbd0 + b0eca08 commit 93071e4

89 files changed

Lines changed: 3307 additions & 11737 deletions

File tree

Some content is hidden

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

.editorconfig

Lines changed: 0 additions & 3 deletions
This file was deleted.

.env.example

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
# Optional token for API calls to the backend
2-
BACKEND_API_TOKEN=
1+
API_TOKEN=
32

4-
# Database connection details
5-
DB_URL=jdbc:h2:./persistence/revanced-api
6-
DB_USER=
7-
DB_PASSWORD=
3+
GITHUB_TOKEN=
84

9-
# Digest auth to issue JWT tokens in the format SHA256("username:ReVanced:password")
10-
AUTH_SHA256_DIGEST=
5+
ORGANIZATION=revanced
116

12-
# JWT configuration for authenticated API endpoints
13-
JWT_SECRET=
14-
JWT_ISSUER=
15-
JWT_VALIDITY_IN_MIN=
7+
PATCHES_REPO=revanced-patches
8+
PATCHES_ASSET_REGEX=rvp$
9+
PATCHES_SIGNATURE_ASSET_REGEX=asc$
10+
PATCHES_PUBLIC_KEY_FILE=keys
1611

17-
# Logging level for the application
18-
LOG_LEVEL=INFO
12+
MANAGER_REPO=revanced-manager
13+
MANAGER_ASSET_REGEX=apk$
14+
MANAGER_DOWNLOADERS_REPO=revanced-manager-downloaders
15+
MANAGER_DOWNLOADERS_ASSET_REGEX=apk$
16+
17+
CONTRIBUTORS_REPOS=revanced-patcher:ReVanced Patcher,revanced-patches:ReVanced Patches,revanced-website:ReVanced Website,revanced-cli:ReVanced CLI,revanced-manager:ReVanced Manager
18+
19+
API_VERSION=5

.gitattributes

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 🐞 Bug report
22
description: Report a bug or an issue.
3-
title: 'bug: '
4-
labels: ['Bug report']
3+
title: "bug: "
4+
labels: ["Bug report"]
55
body:
66
- type: markdown
77
attributes:
@@ -81,11 +81,10 @@ body:
8181
- Add steps to reproduce the bug if possible (Step 1. ... Step 2. ...)
8282
- Add images and videos if possible
8383
validations:
84-
required: true
84+
required: true
8585
- type: textarea
8686
attributes:
8787
label: Error logs
88-
description: Exceptions can be captured by running `logcat | grep AndroidRuntime` in a shell.
8988
render: shell
9089
- type: textarea
9190
attributes:

.github/workflows/build_pull_request.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/deploy.yml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: Deploy
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- main
8+
- dev
9+
10+
jobs:
11+
deploy:
12+
name: Deploy
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: write
16+
steps:
17+
- uses: actions/checkout@v6
18+
19+
- name: Cache dependencies
20+
uses: actions/cache@v4
21+
with:
22+
path: "**/node_modules"
23+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
24+
restore-keys: ${{ runner.os }}-bun-
25+
26+
- name: Setup Node.js
27+
uses: actions/setup-node@v4
28+
with:
29+
node-version: "lts/*"
30+
31+
- name: Setup Bun
32+
uses: oven-sh/setup-bun@v2
33+
34+
- name: Install dependencies
35+
run: bun i --frozen-lockfile
36+
37+
- name: Publish
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
run: bunx semantic-release
41+
42+
- name: Deploy
43+
if: github.ref == 'refs/heads/main'
44+
uses: cloudflare/wrangler-action@v3
45+
with:
46+
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
47+
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
48+
preCommands: |
49+
echo "$ABOUT_JSON" > about.json
50+
echo "$KEYS" > data/keys
51+
bun run db:migration:apply --remote
52+
command: deploy
53+
secrets: |
54+
API_TOKEN
55+
GITHUB_TOKEN
56+
ORGANIZATION
57+
PATCHES_REPO
58+
PATCHES_ASSET_REGEX
59+
PATCHES_SIGNATURE_ASSET_REGEX
60+
PATCHES_PUBLIC_KEY_FILE
61+
MANAGER_REPO
62+
MANAGER_ASSET_REGEX
63+
MANAGER_DOWNLOADERS_REPO
64+
MANAGER_DOWNLOADERS_ASSET_REGEX
65+
CONTRIBUTORS_REPOS
66+
API_VERSION
67+
env:
68+
API_TOKEN: ${{ secrets.API_TOKEN }}
69+
GITHUB_TOKEN: ${{ secrets.READ_REPOSITORIES_GITHUB_TOKEN }}
70+
ORGANIZATION: ${{ vars.ORGANIZATION }}
71+
PATCHES_REPO: ${{ vars.PATCHES_REPO }}
72+
PATCHES_ASSET_REGEX: ${{ vars.PATCHES_ASSET_REGEX }}
73+
PATCHES_SIGNATURE_ASSET_REGEX: ${{ vars.PATCHES_SIGNATURE_ASSET_REGEX }}
74+
PATCHES_PUBLIC_KEY_FILE: ${{ vars.PATCHES_PUBLIC_KEY_FILE }}
75+
MANAGER_REPO: ${{ vars.MANAGER_REPO }}
76+
MANAGER_ASSET_REGEX: ${{ vars.MANAGER_ASSET_REGEX }}
77+
MANAGER_DOWNLOADERS_REPO: ${{ vars.MANAGER_DOWNLOADERS_REPO }}
78+
MANAGER_DOWNLOADERS_ASSET_REGEX: ${{ vars.MANAGER_DOWNLOADERS_ASSET_REGEX }}
79+
CONTRIBUTORS_REPOS: ${{ vars.CONTRIBUTORS_REPOS }}
80+
API_VERSION: ${{ vars.API_VERSION }}
81+
ABOUT_JSON: ${{ vars.ABOUT_JSON }}
82+
KEYS: ${{ vars.KEYS }}

.github/workflows/open_pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919

2020
- name: Open pull request
2121
uses: repo-sync/pull-request@v2

.github/workflows/release.yml

Lines changed: 0 additions & 87 deletions
This file was deleted.

.gitignore

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,6 @@
1-
.gradle
2-
build/
3-
!gradle/wrapper/gradle-wrapper.jar
4-
!**/src/main/**/build/
5-
!**/src/test/**/build/
6-
7-
### STS ###
8-
.apt_generated
9-
.classpath
10-
.factorypath
11-
.project
12-
.settings
13-
.springBeans
14-
.sts4-cache
15-
bin/
16-
!**/src/main/**/bin/
17-
!**/src/test/**/bin/
18-
19-
### IntelliJ IDEA ###
20-
.idea
21-
*.iws
22-
*.iml
23-
*.ipr
24-
out/
25-
!**/src/main/**/out/
26-
!**/src/test/**/out/
27-
28-
### NetBeans ###
29-
/nbproject/private/
30-
/nbbuild/
31-
/dist/
32-
/nbdist/
33-
/.nb-gradle/
34-
35-
### VS Code ###
361
.vscode/
37-
38-
### Project ###
39-
.env
40-
persistence/
41-
configuration.toml
42-
docker-compose.yml
43-
patches-public-key.asc
442
node_modules/
45-
static/
46-
about.json
3+
.wrangler/
4+
.dev.vars
5+
.env
6+
about.json

.gradle/config.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#Tue Mar 10 19:39:02 CET 2026
2+
java.home=C\:\\Users\\oSumAtrIX\\AppData\\Local\\Programs\\Android Studio\\jbr

0 commit comments

Comments
 (0)