Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore!: merge dev to main #798

Merged
merged 29 commits into from
Apr 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
62f7a82
feat: remove notice about stale development [skip ci]
Ushie Mar 20, 2023
ded59d2
feat(ci): update crowdin workflow to use new main branch
Ushie Mar 20, 2023
276f33b
ci: use `semantic-release` (#746)
PalmDevs Mar 23, 2023
d9c5a54
ci(release): fix wrong artifact name and ci not uploading build
PalmDevs Mar 23, 2023
a79f883
ci: use caching to speed up workflows (#760)
validcube Mar 26, 2023
790a6cd
ci(release): remove unnecessary variables in flutter build step
Ushie Mar 26, 2023
ded1a44
ci(release): fix step not moving artifact to accessible path
PalmDevs Mar 26, 2023
d1c12ed
ci(release): use appropriate npm commands for ci environment
PalmDevs Mar 26, 2023
d214a02
ci(release): fix argument parsing of npm exec
PalmDevs Mar 26, 2023
fa40632
ci: dart analyser (#761)
validcube Mar 28, 2023
7839252
ci(analyze): only run when necessary (#766)
validcube Mar 29, 2023
8ea7dd4
ci(release): update node dependencies
PalmDevs Mar 30, 2023
866a6e4
chore(CHANGELOG): reset changelog
PalmDevs Mar 30, 2023
054afbb
feat: confirmation dialog for deleting keystore (#764)
validcube Apr 1, 2023
0b95257
ci(release): update semantic-release
PalmDevs Apr 1, 2023
3b677f8
feat: improve ux (#752)
Aunali321 Apr 18, 2023
dca2d4f
feat: add option to import/export keystore (#776)
andrisas Apr 18, 2023
37b583f
feat: trim extra space when setting custom source (#771)
validcube Apr 18, 2023
197770b
chore: update dependencies (#772)
AmanSikarwar Apr 18, 2023
f0b0282
fix: open contributor links externally (#791)
YarosMallorca Apr 18, 2023
4c9cb56
feat: auto select default patches
Aunali321 Apr 18, 2023
c9adf1c
style: sort imports
Aunali321 Apr 18, 2023
f5aafdb
feat: progress bar for manager updates
Aunali321 Apr 19, 2023
0a1f2da
feat: appreciation message for new contributors
Aunali321 Apr 19, 2023
c748393
docs: remove alpha disclaimer
Aunali321 Apr 19, 2023
bb681e3
feat: disable selecting installed apps for nonroot
Aunali321 Apr 20, 2023
cdfb09f
feat: warning for armv7 devices
Aunali321 Apr 20, 2023
d691892
chore: add missing translations
Aunali321 Apr 20, 2023
62ef1c8
feat: resetting source to default dismiss the sources pop-up (#797)
validcube Apr 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
firstPRMergeComment: >
Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
32 changes: 32 additions & 0 deletions .github/workflows/analyze.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Analyze Code

on:
push:
branches: [ "main", "dev" ]
paths:
- "**.dart"
- ".github/workflows/analyze.yml"
pull_request:
branches: [ "main", "dev" ]
paths:
- "**.dart"
- ".github/workflows/analyze.yml"

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
channel: 'stable'
cache: true
- name: Install Flutter dependencies
run: flutter pub get
- name: Generate files with Builder
run: flutter packages pub run build_runner build --delete-conflicting-outputs
- name: Analyze code
uses: ValentinVignal/action-dart-analyze@v0.15
with:
fail-on: warning
141 changes: 0 additions & 141 deletions .github/workflows/commit-build.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Sync Crowdin translations
on:
push:
branches:
- "flutter"
- "dev"
paths:
- "assets/i18n/en_US.json"
- ".github/workflows/crowdin.yml"
Expand Down
78 changes: 41 additions & 37 deletions .github/workflows/pull-request-build.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,41 @@
name: "Android CI PR Build"

on:
pull_request:
branches:
- "**"

jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Set up JDK 12
uses: actions/setup-java@v3
with:
java-version: '12'
distribution: 'zulu'
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
- name: Set up Flutter
run: flutter pub get
- name: Generate files with Builder
run: flutter packages pub run build_runner build --delete-conflicting-outputs
- name: Build with Flutter
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: flutter build apk
- name: Add version to APK
run: mv build/app/outputs/flutter-apk/app-release.apk revanced-manager-${{ env.RELEASE_VERSION }}.apk
- name: Upload APK
uses: actions/upload-artifact@v3
with:
name: revanced-manager-${{ env.RELEASE_VERSION }}
path: revanced-manager-${{ env.RELEASE_VERSION }}.apk
name: PR Build

on:
workflow_dispatch:

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
# Make sure the release step uses its own credentials:
# https://github.com/cycjimmy/semantic-release-action#private-packages
persist-credentials: false
fetch-depth: 0
- name: Setup JDK
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'zulu'
cache: 'gradle'
- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
channel: 'stable'
cache: true
- name: Install Flutter dependencies
run: flutter pub get
- name: Generate files with Builder
run: flutter packages pub run build_runner build --delete-conflicting-outputs
- name: Build with Flutter
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: flutter build apk
- name: Upload build
uses: actions/upload-artifact@v3
with:
name: revanced-manager
path: build/app/outputs/flutter-apk/app-release.apk
50 changes: 0 additions & 50 deletions .github/workflows/release-build.yml

This file was deleted.

68 changes: 68 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Release

on:
workflow_dispatch:
push:
branches:
- main
- dev
jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
# Make sure the release step uses its own credentials:
# https://github.com/cycjimmy/semantic-release-action#private-packages
persist-credentials: false
fetch-depth: 0
- name: Setup JDK
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'zulu'
cache: 'gradle'
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '18'
cache: 'npm'
- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
channel: 'stable'
cache: true
- name: Install Flutter dependencies
run: flutter pub get
- name: Generate files with Builder
run: flutter packages pub run build_runner build --delete-conflicting-outputs
- name: Build with Flutter
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: flutter build apk
- name: Sign APK
id: sign_apk
uses: ilharp/sign-android-release@v1
with:
releaseDir: build/app/outputs/apk/release
signingKey: ${{ secrets.SIGNING_KEYSTORE }}
keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
- name: Setup semantic-release
run: npm ci
- name: Get release version
run: npm exec -- semantic-release --dry-run
id: get-next-version
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Add version to APK
run: mv $SIGNED_FILE_PATH $(dirname $SIGNED_FILE_PATH)/revanced-manager-${{ steps.get-next-version.outputs.new-release-version }}.apk
env:
SIGNED_FILE_PATH: ${{steps.sign_apk.outputs.signedFile}}
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: npm exec semantic-release
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,7 @@ app.*.map.json
!/dev/ci/**/Gemfile.lock

Firebase related
.firebase
.firebase

# Depdenency directories
node_modules/
Loading