mirror of
https://github.com/JGeek00/adguard-home-manager.git
synced 2025-04-24 15:56:05 +00:00
Merge branch 'beta'
This commit is contained in:
commit
b2f337ead5
10 changed files with 182 additions and 138 deletions
43
.github/workflows/release-beta.yaml
vendored
43
.github/workflows/release-beta.yaml
vendored
|
@ -2,19 +2,9 @@ name: Compile and release beta build
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
branches:
|
||||||
version:
|
- beta
|
||||||
description: "Version"
|
|
||||||
required: true
|
|
||||||
default: "1.0.0"
|
|
||||||
beta-number:
|
|
||||||
description: "Beta number"
|
|
||||||
required: true
|
|
||||||
default: "1"
|
|
||||||
number:
|
|
||||||
description: "Build number"
|
|
||||||
required: true
|
|
||||||
default: "1"
|
|
||||||
jobs:
|
jobs:
|
||||||
build-android:
|
build-android:
|
||||||
name: Build Android .apk and .aab
|
name: Build Android .apk and .aab
|
||||||
|
@ -22,7 +12,6 @@ jobs:
|
||||||
env:
|
env:
|
||||||
ANDROID_AAB_RELEASE_PATH: build/app/outputs/bundle/release
|
ANDROID_AAB_RELEASE_PATH: build/app/outputs/bundle/release
|
||||||
ANDROID_APK_RELEASE_PATH: build/app/outputs/apk/release
|
ANDROID_APK_RELEASE_PATH: build/app/outputs/apk/release
|
||||||
VERSION_NAME: ${{ github.event.inputs.version }}-beta.${{ github.event.inputs.beta-number }}
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
|
@ -33,8 +22,23 @@ jobs:
|
||||||
run: echo "${{ secrets.KEY_PROPERTIES }}" | base64 --decode > android/key.properties
|
run: echo "${{ secrets.KEY_PROPERTIES }}" | base64 --decode > android/key.properties
|
||||||
- name: Decode .env
|
- name: Decode .env
|
||||||
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
|
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
|
||||||
- name: Update version in YAML
|
- name: Read pubspec.yaml
|
||||||
run: sed -i 's/99.99.99+99/${{ env.VERSION_NAME }}+${{ github.event.inputs.number }}/g' pubspec.yaml
|
uses: jbutcher5/read-yaml@1.6
|
||||||
|
id: read_pubspec
|
||||||
|
with:
|
||||||
|
file: './pubspec.yaml'
|
||||||
|
key-path: '["version"]'
|
||||||
|
- name: Split version string
|
||||||
|
uses: winterjung/split@v2
|
||||||
|
id: splitted_version
|
||||||
|
with:
|
||||||
|
msg: "${{ steps.read_pubspec.outputs.data }}"
|
||||||
|
separator: "+"
|
||||||
|
- name: Save version on env variable
|
||||||
|
run: |
|
||||||
|
echo "VERSION_NAME=$(echo ${{ steps.splitted_version.outputs._0 }})" >> $GITHUB_ENV
|
||||||
|
echo "::set-output name=version_name::${{ steps.splitted_version.outputs._0 }}"
|
||||||
|
echo "::set-output name=version_number::${{ steps.splitted_version.outputs._1 }}"
|
||||||
- name: Update KeyStore password in gradle properties
|
- name: Update KeyStore password in gradle properties
|
||||||
run: sed -i 's/#{KEYSTORE_PASS}#/${{ secrets.KEYSTORE_PASS }}/g' android/key.properties
|
run: sed -i 's/#{KEYSTORE_PASS}#/${{ secrets.KEYSTORE_PASS }}/g' android/key.properties
|
||||||
- name: Update KeyStore key password in gradle properties
|
- name: Update KeyStore key password in gradle properties
|
||||||
|
@ -70,7 +74,8 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [build-android]
|
needs: [build-android]
|
||||||
env:
|
env:
|
||||||
VERSION_NAME: ${{ github.event.inputs.version }}-beta.${{ github.event.inputs.beta-number }}
|
VERSION_NAME: ${{ needs.build-android.outputs.version_name }}
|
||||||
|
VERSION_NUMBER: ${{ needs.build-android.outputs.version_number }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
|
@ -87,7 +92,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
artifacts: "releases/*"
|
artifacts: "releases/*"
|
||||||
token: ${{ secrets.GH_TOKEN }}
|
token: ${{ secrets.GH_TOKEN }}
|
||||||
tag: '${{ env.VERSION_NAME }}_(${{ github.event.inputs.number }})'
|
tag: '${{ env.VERSION_NAME }}_(${{ env.VERSION_NUMBER }})'
|
||||||
name: v${{ env.VERSION_NAME }}
|
name: v${{ env.VERSION_NAME }}
|
||||||
draft: true
|
draft: true
|
||||||
prerelease: true
|
prerelease: true
|
||||||
|
@ -97,7 +102,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [build-android]
|
needs: [build-android]
|
||||||
env:
|
env:
|
||||||
VERSION_NAME: ${{ github.event.inputs.version }}-beta.${{ github.event.inputs.beta-number }}
|
VERSION_NAME: ${{ needs.build-android.outputs.version_name }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
|
|
135
.github/workflows/release-stable.yaml
vendored
135
.github/workflows/release-stable.yaml
vendored
|
@ -2,15 +2,8 @@ name: Compile and release production build
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
branches:
|
||||||
version:
|
- master
|
||||||
description: "Version"
|
|
||||||
required: true
|
|
||||||
default: "1.0.0"
|
|
||||||
number:
|
|
||||||
description: "Build number"
|
|
||||||
required: true
|
|
||||||
default: "1"
|
|
||||||
jobs:
|
jobs:
|
||||||
build-android:
|
build-android:
|
||||||
name: Build Android .apk and .aab
|
name: Build Android .apk and .aab
|
||||||
|
@ -26,8 +19,23 @@ jobs:
|
||||||
run: echo "${{ secrets.KEY_PROPERTIES }}" | base64 --decode > android/key.properties
|
run: echo "${{ secrets.KEY_PROPERTIES }}" | base64 --decode > android/key.properties
|
||||||
- name: Decode .env
|
- name: Decode .env
|
||||||
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
|
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
|
||||||
- name: Update version in YAML
|
- name: Read pubspec.yaml
|
||||||
run: sed -i 's/99.99.99+99/${{ github.event.inputs.version }}+${{ github.event.inputs.number }}/g' pubspec.yaml
|
uses: jbutcher5/read-yaml@1.6
|
||||||
|
id: read_pubspec
|
||||||
|
with:
|
||||||
|
file: './pubspec.yaml'
|
||||||
|
key-path: '["version"]'
|
||||||
|
- name: Split version string
|
||||||
|
uses: winterjung/split@v2
|
||||||
|
id: splitted_version
|
||||||
|
with:
|
||||||
|
msg: "${{ steps.read_pubspec.outputs.data }}"
|
||||||
|
separator: "+"
|
||||||
|
- name: Save version on env variable
|
||||||
|
run: |
|
||||||
|
echo "VERSION_NAME=$(echo ${{ steps.splitted_version.outputs._0 }})" >> $GITHUB_ENV
|
||||||
|
echo "::set-output name=version_name::${{ steps.splitted_version.outputs._0 }}"
|
||||||
|
echo "::set-output name=version_number::${{ steps.splitted_version.outputs._1 }}"
|
||||||
- name: Update KeyStore password in gradle properties
|
- name: Update KeyStore password in gradle properties
|
||||||
run: sed -i 's/#{KEYSTORE_PASS}#/${{ secrets.KEYSTORE_PASS }}/g' android/key.properties
|
run: sed -i 's/#{KEYSTORE_PASS}#/${{ secrets.KEYSTORE_PASS }}/g' android/key.properties
|
||||||
- name: Update KeyStore key password in gradle properties
|
- name: Update KeyStore key password in gradle properties
|
||||||
|
@ -44,20 +52,20 @@ jobs:
|
||||||
- run: flutter build apk --release
|
- run: flutter build apk --release
|
||||||
- run: flutter build appbundle --release
|
- run: flutter build appbundle --release
|
||||||
- name: Rename apk
|
- name: Rename apk
|
||||||
run: mv $ANDROID_APK_RELEASE_PATH/app-release.apk $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk
|
run: mv $ANDROID_APK_RELEASE_PATH/app-release.apk $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk
|
||||||
- name: Rename aab
|
- name: Rename aab
|
||||||
run: mv $ANDROID_AAB_RELEASE_PATH/app-release.aab $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
|
run: mv $ANDROID_AAB_RELEASE_PATH/app-release.aab $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
|
||||||
- name: Copy apk to project root
|
- name: Copy apk to project root
|
||||||
run: cp $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk
|
run: cp $ANDROID_APK_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk
|
||||||
- name: Copy aab to project root
|
- name: Copy aab to project root
|
||||||
run: cp $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
|
run: cp $ANDROID_AAB_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: android
|
name: android
|
||||||
path: |
|
path: |
|
||||||
AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
|
AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
|
||||||
AdGuardHomeManager_${{ github.event.inputs.version }}_Android.apk
|
AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.apk
|
||||||
build-macos:
|
build-macos:
|
||||||
name: Build macOS .dmg
|
name: Build macOS .dmg
|
||||||
runs-on: macos-latest
|
runs-on: macos-latest
|
||||||
|
@ -67,8 +75,23 @@ jobs:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Decode .env
|
- name: Decode .env
|
||||||
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
|
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
|
||||||
- name: Update version in YAML
|
- name: Read pubspec.yaml
|
||||||
run: sed -i '' 's/99.99.99+99/${{ github.event.inputs.version }}+${{ github.event.inputs.number }}/g' pubspec.yaml
|
uses: jbutcher5/read-yaml@1.6
|
||||||
|
id: read_pubspec
|
||||||
|
with:
|
||||||
|
file: './pubspec.yaml'
|
||||||
|
key-path: '["version"]'
|
||||||
|
- name: Split version string
|
||||||
|
uses: winterjung/split@v2
|
||||||
|
id: splitted_version
|
||||||
|
with:
|
||||||
|
msg: "${{ steps.read_pubspec.outputs.data }}"
|
||||||
|
separator: "+"
|
||||||
|
- name: Save version on env variable
|
||||||
|
run: |
|
||||||
|
echo "VERSION_NAME=$(echo ${{ steps.splitted_version.outputs._0 }})" >> $GITHUB_ENV
|
||||||
|
echo "::set-output name=version_name::${{ steps.splitted_version.outputs._0 }}"
|
||||||
|
echo "::set-output name=version_number::${{ steps.splitted_version.outputs._1 }}"
|
||||||
- uses: subosito/flutter-action@v2
|
- uses: subosito/flutter-action@v2
|
||||||
with:
|
with:
|
||||||
channel: "stable"
|
channel: "stable"
|
||||||
|
@ -96,14 +119,14 @@ jobs:
|
||||||
- name: Generate symbolic link to Applications dir
|
- name: Generate symbolic link to Applications dir
|
||||||
run: ln -s /Applications $MACOS_APP_RELEASE_PATH/AdGuard\ Home\ Manager
|
run: ln -s /Applications $MACOS_APP_RELEASE_PATH/AdGuard\ Home\ Manager
|
||||||
- name: Generate dmg
|
- name: Generate dmg
|
||||||
run: hdiutil create -srcfolder $MACOS_APP_RELEASE_PATH/AdGuard\ Home\ Manager $MACOS_APP_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_macOS_Universal.dmg
|
run: hdiutil create -srcfolder $MACOS_APP_RELEASE_PATH/AdGuard\ Home\ Manager $MACOS_APP_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_macOS_Universal.dmg
|
||||||
- name: Copy dmg to project root
|
- name: Copy dmg to project root
|
||||||
run: cp $MACOS_APP_RELEASE_PATH/AdGuardHomeManager_${{ github.event.inputs.version }}_macOS_Universal.dmg AdGuardHomeManager_${{ github.event.inputs.version }}_macOS_Universal.dmg
|
run: cp $MACOS_APP_RELEASE_PATH/AdGuardHomeManager_${{ env.VERSION_NAME }}_macOS_Universal.dmg AdGuardHomeManager_${{ env.VERSION_NAME }}_macOS_Universal.dmg
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: macos
|
name: macos
|
||||||
path: AdGuardHomeManager_${{ github.event.inputs.version }}_macOS_Universal.dmg
|
path: AdGuardHomeManager_${{ env.VERSION_NAME }}_macOS_Universal.dmg
|
||||||
build-linux:
|
build-linux:
|
||||||
name: Build Linux .tar.gz and .deb
|
name: Build Linux .tar.gz and .deb
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
@ -111,10 +134,25 @@ jobs:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Decode .env
|
- name: Decode .env
|
||||||
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
|
run: echo "${{ secrets.ENV }}" | base64 --decode > .env
|
||||||
- name: Update version in pubspec.yaml
|
- name: Read pubspec.yaml
|
||||||
run: sed -i 's/99.99.99+99/${{ github.event.inputs.version }}+${{ github.event.inputs.number }}/g' pubspec.yaml
|
uses: jbutcher5/read-yaml@1.6
|
||||||
|
id: read_pubspec
|
||||||
|
with:
|
||||||
|
file: './pubspec.yaml'
|
||||||
|
key-path: '["version"]'
|
||||||
|
- name: Split version string
|
||||||
|
uses: winterjung/split@v2
|
||||||
|
id: splitted_version
|
||||||
|
with:
|
||||||
|
msg: "${{ steps.read_pubspec.outputs.data }}"
|
||||||
|
separator: "+"
|
||||||
|
- name: Save version on env variable
|
||||||
|
run: |
|
||||||
|
echo "VERSION_NAME=$(echo ${{ steps.splitted_version.outputs._0 }})" >> $GITHUB_ENV
|
||||||
|
echo "::set-output name=version_name::${{ steps.splitted_version.outputs._0 }}"
|
||||||
|
echo "::set-output name=version_number::${{ steps.splitted_version.outputs._1 }}"
|
||||||
- name: Update version in debian.yaml
|
- name: Update version in debian.yaml
|
||||||
run: sed -i 's/<REPLACE_VERSION_NUMBER_ACTIONS>/${{ github.event.inputs.version }}/g' debian/debian.yaml
|
run: sed -i 's/<REPLACE_VERSION_NUMBER_ACTIONS>/${{ env.VERSION_NAME }}/g' debian/debian.yaml
|
||||||
- name: Update dependencies list
|
- name: Update dependencies list
|
||||||
run: sudo apt-get update
|
run: sudo apt-get update
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
@ -130,7 +168,7 @@ jobs:
|
||||||
- name: Generate .deb package
|
- name: Generate .deb package
|
||||||
run: flutter_to_debian
|
run: flutter_to_debian
|
||||||
- name: Move .deb package to project root
|
- name: Move .deb package to project root
|
||||||
run: mv debian/packages/AdGuardHomeManager_${{ github.event.inputs.version }}_amd64.deb AdGuardHomeManager_${{ github.event.inputs.version }}_Linux_amd64.deb
|
run: mv debian/packages/AdGuardHomeManager_${{ env.VERSION_NAME }}_amd64.deb AdGuardHomeManager_${{ env.VERSION_NAME }}_Linux_amd64.deb
|
||||||
- name: Generate .tar.gz package
|
- name: Generate .tar.gz package
|
||||||
uses: a7ul/tar-action@v1.1.3
|
uses: a7ul/tar-action@v1.1.3
|
||||||
id: compress
|
id: compress
|
||||||
|
@ -141,14 +179,14 @@ jobs:
|
||||||
./data
|
./data
|
||||||
./lib
|
./lib
|
||||||
./AdGuardHomeManager
|
./AdGuardHomeManager
|
||||||
outPath: AdGuardHomeManager_${{ github.event.inputs.version }}_Linux.tar.gz
|
outPath: AdGuardHomeManager_${{ env.VERSION_NAME }}_Linux.tar.gz
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: linux
|
name: linux
|
||||||
path: |
|
path: |
|
||||||
AdGuardHomeManager_${{ github.event.inputs.version }}_Linux_amd64.deb
|
AdGuardHomeManager_${{ env.VERSION_NAME }}_Linux_amd64.deb
|
||||||
AdGuardHomeManager_${{ github.event.inputs.version }}_Linux.tar.gz
|
AdGuardHomeManager_${{ env.VERSION_NAME }}_Linux.tar.gz
|
||||||
build-windows:
|
build-windows:
|
||||||
name: Build Windows installer
|
name: Build Windows installer
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
@ -158,13 +196,27 @@ jobs:
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: |
|
run: |
|
||||||
[IO.File]::WriteAllBytes('.env', [Convert]::FromBase64String('${{ secrets.ENV }}'))
|
[IO.File]::WriteAllBytes('.env', [Convert]::FromBase64String('${{ secrets.ENV }}'))
|
||||||
- name: Update version in pubspec.yaml
|
- name: Read pubspec.yaml
|
||||||
shell: bash
|
uses: jbutcher5/read-yaml@1.6
|
||||||
run: sed -i 's/99.99.99+99/${{ github.event.inputs.version }}+${{ github.event.inputs.number }}/g' pubspec.yaml
|
id: read_pubspec
|
||||||
|
with:
|
||||||
|
file: './pubspec.yaml'
|
||||||
|
key-path: '["version"]'
|
||||||
|
- name: Split version string
|
||||||
|
uses: winterjung/split@v2
|
||||||
|
id: splitted_version
|
||||||
|
with:
|
||||||
|
msg: "${{ steps.read_pubspec.outputs.data }}"
|
||||||
|
separator: "+"
|
||||||
|
- name: Save version on env variable
|
||||||
|
run: |
|
||||||
|
echo "VERSION_NAME=$(echo ${{ steps.splitted_version.outputs._0 }})" >> $GITHUB_ENV
|
||||||
|
echo "::set-output name=version_name::${{ steps.splitted_version.outputs._0 }}"
|
||||||
|
echo "::set-output name=version_number::${{ steps.splitted_version.outputs._1 }}"
|
||||||
- name: Update version in innosetup config file
|
- name: Update version in innosetup config file
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: |
|
run: |
|
||||||
(Get-Content windows/innosetup_installer_builder.iss) -replace '<REPLACE_VERSION_ACTIONS>', '${{ github.event.inputs.version }}' | Out-File -encoding ASCII windows/innosetup_installer_builder.iss
|
(Get-Content windows/innosetup_installer_builder.iss) -replace '<REPLACE_VERSION_ACTIONS>', '${{ env.VERSION_NAME }}' | Out-File -encoding ASCII windows/innosetup_installer_builder.iss
|
||||||
- uses: subosito/flutter-action@v2
|
- uses: subosito/flutter-action@v2
|
||||||
with:
|
with:
|
||||||
channel: "stable"
|
channel: "stable"
|
||||||
|
@ -174,16 +226,19 @@ jobs:
|
||||||
- name: Build installer witn innosetup
|
- name: Build installer witn innosetup
|
||||||
run: iscc /Q windows/innosetup_installer_builder.iss
|
run: iscc /Q windows/innosetup_installer_builder.iss
|
||||||
- name: Move installer file to root directory
|
- name: Move installer file to root directory
|
||||||
run: move build/windows/aghm_installer.exe AdGuardHomeManager_${{ github.event.inputs.version }}_Windows_x64.exe
|
run: move build/windows/aghm_installer.exe AdGuardHomeManager_${{ env.VERSION_NAME }}_Windows_x64.exe
|
||||||
- name: Upload artifact
|
- name: Upload artifact
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: windows
|
name: windows
|
||||||
path: AdGuardHomeManager_${{ github.event.inputs.version }}_Windows_x64.exe
|
path: AdGuardHomeManager_${{ env.VERSION_NAME }}_Windows_x64.exe
|
||||||
release-builds-github:
|
release-builds-github:
|
||||||
name: Release builds to GitHub
|
name: Release builds to GitHub
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [build-android, build-macos, build-linux, build-windows]
|
needs: [build-android, build-macos, build-linux, build-windows]
|
||||||
|
env:
|
||||||
|
VERSION_NAME: ${{ needs.build-android.outputs.version_name }}
|
||||||
|
VERSION_NUMBER: ${{ needs.build-android.outputs.version_number }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Create builds directory
|
- name: Create builds directory
|
||||||
|
@ -213,8 +268,8 @@ jobs:
|
||||||
with:
|
with:
|
||||||
artifacts: "releases/*"
|
artifacts: "releases/*"
|
||||||
token: ${{ secrets.GH_TOKEN }}
|
token: ${{ secrets.GH_TOKEN }}
|
||||||
tag: '${{ github.event.inputs.version }}_(${{ github.event.inputs.number }})'
|
tag: '${{ env.VERSION_NAME }}_(${{ env.VERSION_NUMBER }})'
|
||||||
name: v${{ github.event.inputs.version }}
|
name: v${{ env.VERSION_NAME }}
|
||||||
draft: true
|
draft: true
|
||||||
prerelease: false
|
prerelease: false
|
||||||
commit: ${{ github.sha }}
|
commit: ${{ github.sha }}
|
||||||
|
@ -222,6 +277,8 @@ jobs:
|
||||||
name: Release Android build to the Google Play Store
|
name: Release Android build to the Google Play Store
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: [build-android, build-macos, build-linux, build-windows]
|
needs: [build-android, build-macos, build-linux, build-windows]
|
||||||
|
env:
|
||||||
|
VERSION_NAME: ${{ needs.build-android.outputs.version_name }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Download Android artifacts
|
- name: Download Android artifacts
|
||||||
|
@ -233,7 +290,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
serviceAccountJsonPlainText: ${{ secrets.PLAYSTORE_ACCOUNT_KEY }}
|
serviceAccountJsonPlainText: ${{ secrets.PLAYSTORE_ACCOUNT_KEY }}
|
||||||
packageName: com.jgeek00.adguard_home_manager
|
packageName: com.jgeek00.adguard_home_manager
|
||||||
releaseFiles: AdGuardHomeManager_${{ github.event.inputs.version }}_Android.aab
|
releaseFiles: AdGuardHomeManager_${{ env.VERSION_NAME }}_Android.aab
|
||||||
track: production
|
track: production
|
||||||
status: draft
|
status: draft
|
||||||
releaseName: ${{ github.event.inputs.version }}
|
releaseName: ${{ env.VERSION_NAME }}
|
|
@ -14,7 +14,7 @@ Future<GitHubRelease?> checkAppUpdates({
|
||||||
}) async {
|
}) async {
|
||||||
var result = isBeta
|
var result = isBeta
|
||||||
? await ExternalRequests.getReleasesGitHub()
|
? await ExternalRequests.getReleasesGitHub()
|
||||||
: await ExternalRequests.getLatestReleaseGitHub();
|
: await ExternalRequests.getReleaseData();
|
||||||
|
|
||||||
if (result.successful == true) {
|
if (result.successful == true) {
|
||||||
late GitHubRelease gitHubRelease;
|
late GitHubRelease gitHubRelease;
|
||||||
|
@ -30,7 +30,7 @@ Future<GitHubRelease?> checkAppUpdates({
|
||||||
gitHubRelease: gitHubRelease,
|
gitHubRelease: gitHubRelease,
|
||||||
isBeta: isBeta
|
isBeta: isBeta
|
||||||
);
|
);
|
||||||
|
print(update);
|
||||||
if (update == true) {
|
if (update == true) {
|
||||||
setUpdateAvailable(gitHubRelease);
|
setUpdateAvailable(gitHubRelease);
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@ import 'dart:async';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:sqflite/sqflite.dart';
|
import 'package:sqflite/sqflite.dart';
|
||||||
|
|
||||||
|
import 'package:adguard_home_manager/models/github_release.dart';
|
||||||
import 'package:adguard_home_manager/services/api_client.dart';
|
import 'package:adguard_home_manager/services/api_client.dart';
|
||||||
import 'package:adguard_home_manager/services/external_requests.dart';
|
import 'package:adguard_home_manager/services/external_requests.dart';
|
||||||
import 'package:adguard_home_manager/models/server.dart';
|
import 'package:adguard_home_manager/models/server.dart';
|
||||||
|
@ -188,9 +189,9 @@ class ServersProvider with ChangeNotifier {
|
||||||
final result = await client!.checkServerUpdates();
|
final result = await client!.checkServerUpdates();
|
||||||
if (result.successful == true) {
|
if (result.successful == true) {
|
||||||
UpdateAvailableData data = UpdateAvailableData.fromJson(result.content);
|
UpdateAvailableData data = UpdateAvailableData.fromJson(result.content);
|
||||||
final gitHubResult = await ExternalRequests.getUpdateChangelog(releaseTag: data.newVersion ?? data.currentVersion);
|
final gitHubResult = await ExternalRequests.getReleaseData(releaseTag: data.newVersion ?? data.currentVersion);
|
||||||
if (gitHubResult.successful == true) {
|
if (gitHubResult.successful == true) {
|
||||||
data.changelog = gitHubResult.content;
|
data.changelog = (gitHubResult.content as GitHubRelease).body;
|
||||||
}
|
}
|
||||||
setUpdateAvailableData(data);
|
setUpdateAvailableData(data);
|
||||||
setUpdateAvailableLoadStatus(LoadStatus.loaded, true);
|
setUpdateAvailableLoadStatus(LoadStatus.loaded, true);
|
||||||
|
@ -262,7 +263,7 @@ class ServersProvider with ChangeNotifier {
|
||||||
if (result.successful == true) {
|
if (result.successful == true) {
|
||||||
UpdateAvailableData data = UpdateAvailableData.fromJsonUpdate(result.content);
|
UpdateAvailableData data = UpdateAvailableData.fromJsonUpdate(result.content);
|
||||||
if (data.currentVersion == data.newVersion) {
|
if (data.currentVersion == data.newVersion) {
|
||||||
final gitHubResult = await ExternalRequests.getUpdateChangelog(releaseTag: data.newVersion ?? data.currentVersion);
|
final gitHubResult = await ExternalRequests.getReleaseData(releaseTag: data.newVersion ?? data.currentVersion);
|
||||||
if (gitHubResult.successful == true) {
|
if (gitHubResult.successful == true) {
|
||||||
data.changelog = gitHubResult.content;
|
data.changelog = gitHubResult.content;
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
import 'package:adguard_home_manager/screens/logs/log_tile.dart';
|
import 'package:adguard_home_manager/screens/logs/log_tile.dart';
|
||||||
import 'package:adguard_home_manager/screens/logs/details/log_details_screen.dart';
|
import 'package:adguard_home_manager/screens/logs/details/log_details_screen.dart';
|
||||||
|
|
||||||
|
import 'package:adguard_home_manager/services/api_client.dart';
|
||||||
import 'package:adguard_home_manager/functions/desktop_mode.dart';
|
import 'package:adguard_home_manager/functions/desktop_mode.dart';
|
||||||
import 'package:adguard_home_manager/models/logs.dart';
|
import 'package:adguard_home_manager/models/logs.dart';
|
||||||
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
import 'package:adguard_home_manager/providers/app_config_provider.dart';
|
||||||
|
@ -21,13 +22,13 @@ class LogsListClient extends StatefulWidget {
|
||||||
final bool splitView;
|
final bool splitView;
|
||||||
|
|
||||||
const LogsListClient({
|
const LogsListClient({
|
||||||
Key? key,
|
super.key,
|
||||||
required this.ip,
|
required this.ip,
|
||||||
this.name,
|
this.name,
|
||||||
required this.serversProvider,
|
required this.serversProvider,
|
||||||
required this.appConfigProvider,
|
required this.appConfigProvider,
|
||||||
required this.splitView,
|
required this.splitView,
|
||||||
}) : super(key: key);
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<LogsListClient> createState() => _LogsListClientState();
|
State<LogsListClient> createState() => _LogsListClientState();
|
||||||
|
@ -74,32 +75,28 @@ class _LogsListClientState extends State<LogsListClient> {
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
final result = await cancelableRequest?.value;
|
final result = await cancelableRequest?.value as ApiResponse;
|
||||||
|
if (!mounted) return;
|
||||||
|
|
||||||
if (result != null) {
|
|
||||||
if (loadingMore != null && loadingMore == true && mounted) {
|
if (loadingMore != null && loadingMore == true && mounted) {
|
||||||
setState(() => isLoadingMore = false);
|
setState(() => isLoadingMore = false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mounted) {
|
if (result.successful == true) {
|
||||||
if (result['result'] == 'success') {
|
|
||||||
setState(() => offset = inOffset != null ? inOffset+logsQuantity : offset+logsQuantity);
|
setState(() => offset = inOffset != null ? inOffset+logsQuantity : offset+logsQuantity);
|
||||||
if (loadingMore != null && loadingMore == true && logsData != null) {
|
if (loadingMore != null && loadingMore == true && logsData != null) {
|
||||||
LogsData newLogsData = result['data'];
|
LogsData newLogsData = result.content;
|
||||||
newLogsData.data = [...logsData!.data, ...result['data'].data];
|
newLogsData.data = [...logsData!.data, ...result.content.data];
|
||||||
setState(() => logsData = newLogsData);
|
setState(() => logsData = newLogsData);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
LogsData newLogsData = result['data'];
|
LogsData newLogsData = result.content;
|
||||||
setState(() => logsData = newLogsData);
|
setState(() => logsData = newLogsData);
|
||||||
}
|
}
|
||||||
setState(() => loadStatus = 1);
|
setState(() => loadStatus = 1);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
setState(() => loadStatus = 2);
|
setState(() => loadStatus = 2);
|
||||||
widget.appConfigProvider.addLog(result['log']);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -689,10 +689,15 @@ class ApiClientV2 {
|
||||||
server: server,
|
server: server,
|
||||||
body: data,
|
body: data,
|
||||||
);
|
);
|
||||||
|
try {
|
||||||
return ApiResponse(
|
return ApiResponse(
|
||||||
successful: result.successful,
|
successful: result.successful,
|
||||||
content: result.body != null ? jsonDecode(result.body!) : null
|
content: result.body != null ? jsonDecode(result.body!) : null
|
||||||
);
|
);
|
||||||
|
} catch (e, stackTrace) {
|
||||||
|
Sentry.captureException(e, stackTrace: stackTrace);
|
||||||
|
return const ApiResponse(successful: false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<ApiResponse> saveEncryptionSettings({
|
Future<ApiResponse> saveEncryptionSettings({
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
|
||||||
|
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
import 'package:sentry_flutter/sentry_flutter.dart';
|
import 'package:sentry_flutter/sentry_flutter.dart';
|
||||||
|
|
||||||
import 'package:adguard_home_manager/models/github_release.dart';
|
import 'package:adguard_home_manager/models/github_release.dart';
|
||||||
|
@ -8,72 +8,48 @@ import 'package:adguard_home_manager/constants/urls.dart';
|
||||||
import 'package:adguard_home_manager/services/api_client.dart';
|
import 'package:adguard_home_manager/services/api_client.dart';
|
||||||
|
|
||||||
class ExternalRequests {
|
class ExternalRequests {
|
||||||
static Future<ApiResponse> getUpdateChangelog({
|
|
||||||
required String releaseTag
|
|
||||||
}) async {
|
|
||||||
try {
|
|
||||||
HttpClient httpClient = HttpClient();
|
|
||||||
HttpClientRequest request = await httpClient.getUrl(Uri.parse("${Urls.adGuardHomeReleasesTags}/$releaseTag"));
|
|
||||||
HttpClientResponse response = await request.close();
|
|
||||||
String reply = await response.transform(utf8.decoder).join();
|
|
||||||
httpClient.close();
|
|
||||||
if (response.statusCode == 200) {
|
|
||||||
return ApiResponse(
|
|
||||||
successful: true,
|
|
||||||
content: jsonDecode(reply)['body'],
|
|
||||||
statusCode: response.statusCode
|
|
||||||
);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return const ApiResponse(successful: false);
|
|
||||||
}
|
|
||||||
} catch (e, stackTrace) {
|
|
||||||
Sentry.captureException(e, stackTrace: stackTrace);
|
|
||||||
return const ApiResponse(successful: false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static Future<ApiResponse> getReleasesGitHub() async {
|
static Future<ApiResponse> getReleasesGitHub() async {
|
||||||
try {
|
try {
|
||||||
HttpClient httpClient = HttpClient();
|
final response = await http.get(Uri.parse(Urls.getReleasesGitHub));
|
||||||
HttpClientRequest request = await httpClient.getUrl(Uri.parse(Urls.getReleasesGitHub));
|
|
||||||
HttpClientResponse response = await request.close();
|
|
||||||
String reply = await response.transform(utf8.decoder).join();
|
|
||||||
httpClient.close();
|
|
||||||
if (response.statusCode == 200) {
|
if (response.statusCode == 200) {
|
||||||
return ApiResponse(
|
return ApiResponse(
|
||||||
successful: true,
|
successful: true,
|
||||||
content: List<GitHubRelease>.from(jsonDecode(reply).map((entry) => GitHubRelease.fromJson(entry)))
|
content: List<GitHubRelease>.from(
|
||||||
|
jsonDecode(response.body).map((entry) => GitHubRelease.fromJson(entry))
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return const ApiResponse(successful: false);
|
return const ApiResponse(successful: false);
|
||||||
}
|
}
|
||||||
} catch (e, stackTrace) {
|
} catch (e) {
|
||||||
Sentry.captureException(e, stackTrace: stackTrace);
|
|
||||||
return const ApiResponse(successful: false);
|
return const ApiResponse(successful: false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<ApiResponse> getLatestReleaseGitHub() async {
|
static Future<ApiResponse> getReleaseData({
|
||||||
|
// If releaseTag is null gets latest release
|
||||||
|
String? releaseTag
|
||||||
|
}) async {
|
||||||
try {
|
try {
|
||||||
HttpClient httpClient = HttpClient();
|
final response = await http.get(
|
||||||
HttpClientRequest request = await httpClient.getUrl(Uri.parse(Urls.getLatestReleaseGitHub));
|
Uri.parse(
|
||||||
HttpClientResponse response = await request.close();
|
releaseTag != null
|
||||||
String reply = await response.transform(utf8.decoder).join();
|
? "${Urls.adGuardHomeReleasesTags}/$releaseTag"
|
||||||
httpClient.close();
|
: Urls.getLatestReleaseGitHub
|
||||||
|
)
|
||||||
|
);
|
||||||
if (response.statusCode == 200) {
|
if (response.statusCode == 200) {
|
||||||
return ApiResponse(
|
return ApiResponse(
|
||||||
successful: true,
|
successful: true,
|
||||||
content: GitHubRelease.fromJson(jsonDecode(reply)),
|
content: GitHubRelease.fromJson(jsonDecode(response.body)),
|
||||||
statusCode: response.statusCode
|
statusCode: response.statusCode
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return const ApiResponse(successful: false);
|
return const ApiResponse(successful: false);
|
||||||
}
|
}
|
||||||
} catch (e, stackTrace) {
|
} catch (e) {
|
||||||
Sentry.captureException(e, stackTrace: stackTrace);
|
|
||||||
return const ApiResponse(successful: false);
|
return const ApiResponse(successful: false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:animations/animations.dart';
|
import 'package:animations/animations.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
@ -36,6 +37,7 @@ class _LayoutState extends State<Layout> with WidgetsBindingObserver {
|
||||||
super.initState();
|
super.initState();
|
||||||
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
WidgetsBinding.instance.addPostFrameCallback((_) async {
|
||||||
|
if (kDebugMode) return; // Don't check for app updates on debug mode
|
||||||
final appConfigProvider = Provider.of<AppConfigProvider>(context, listen: false);
|
final appConfigProvider = Provider.of<AppConfigProvider>(context, listen: false);
|
||||||
final result = await checkAppUpdates(
|
final result = await checkAppUpdates(
|
||||||
currentBuildNumber: appConfigProvider.getAppInfo!.buildNumber,
|
currentBuildNumber: appConfigProvider.getAppInfo!.buildNumber,
|
||||||
|
|
|
@ -319,7 +319,7 @@ packages:
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.15.4"
|
version: "0.15.4"
|
||||||
http:
|
http:
|
||||||
dependency: transitive
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: http
|
name: http
|
||||||
sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
|
sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
|
||||||
|
|
|
@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
# In Windows, build-name is used as the major, minor, and patch parts
|
# In Windows, build-name is used as the major, minor, and patch parts
|
||||||
# of the product and file versions while build-number is used as the build suffix.
|
# of the product and file versions while build-number is used as the build suffix.
|
||||||
version: 99.99.99+99
|
version: 2.11.1+106
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=2.18.1 <3.0.0'
|
sdk: '>=2.18.1 <3.0.0'
|
||||||
|
@ -75,6 +75,7 @@ dependencies:
|
||||||
flutter_reorderable_list: ^1.3.1
|
flutter_reorderable_list: ^1.3.1
|
||||||
pie_chart: ^5.4.0
|
pie_chart: ^5.4.0
|
||||||
segmented_button_slide: ^1.0.4
|
segmented_button_slide: ^1.0.4
|
||||||
|
http: ^1.1.0
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
|
|
Loading…
Add table
Reference in a new issue