luckyimnotanigger/adguard-home-manager
1
0
Fork 0
mirror of https://github.com/JGeek00/adguard-home-manager.git synced 2025-05-27 04:07:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'beta'

Browse source
This commit is contained in:
Juan Gilsanz Polo 2023-11-23 02:57:25 +01:00
commit 5d4a2cd421
2 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/release-beta.yaml vendored
View file

@ -12,6 +12,9 @@ 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
outputs:
VERSION_NAME: ${{ steps.save_version.outputs.version_name }}
VERSION_NUMBER: ${{ steps.save_version.outputs.version_number }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -29,13 +32,14 @@ jobs:
file: './pubspec.yaml' file: './pubspec.yaml'
key-path: '["version"]' key-path: '["version"]'
- name: Save version on env variable - name: Save version on env variable
id: save_version
run: | run: |
version=${{ steps.read_pubspec.outputs.data }} version=${{ steps.read_pubspec.outputs.data }}
IFS='+' IFS='+'
read -r -a split <<< "$version" read -r -a split <<< "$version"
echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_ENV echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_ENV
echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_OUTPUT echo "version_name=${split[0]}" >> $GITHUB_OUTPUT
echo "VERSION_NUMBER=$(echo ${split[1]})" >> $GITHUB_OUTPUT echo "version_number=${split[1]}" >> $GITHUB_OUTPUT
- 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
@ -71,8 +75,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [build-android] needs: [build-android]
env: env:
VERSION_NAME: ${{ needs.build-android.outputs.version_name }} VERSION_NAME: ${{ needs.build-android.outputs.VERSION_NAME }}
VERSION_NUMBER: ${{ needs.build-android.outputs.version_number }} VERSION_NUMBER: ${{ needs.build-android.outputs.VERSION_NUMBER }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -99,7 +103,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [build-android] needs: [build-android]
env: env:
VERSION_NAME: ${{ needs.build-android.outputs.version_name }} VERSION_NAME: ${{ needs.build-android.outputs.VERSION_NAME }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:

38
.github/workflows/release-stable.yaml vendored
View file

@ -11,6 +11,9 @@ 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
outputs:
VERSION_NAME: ${{ steps.save_version.outputs.version_name }}
VERSION_NUMBER: ${{ steps.save_version.outputs.version_number }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Decode android/app/keystore.jks - name: Decode android/app/keystore.jks
@ -26,13 +29,14 @@ jobs:
file: './pubspec.yaml' file: './pubspec.yaml'
key-path: '["version"]' key-path: '["version"]'
- name: Save version on env variable - name: Save version on env variable
id: save_version
run: | run: |
version=${{ steps.read_pubspec.outputs.data }} version=${{ steps.read_pubspec.outputs.data }}
IFS='+' IFS='+'
read -r -a split <<< "$version" read -r -a split <<< "$version"
echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_ENV echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_ENV
echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_OUTPUT echo "version_name=${split[0]}" >> $GITHUB_OUTPUT
echo "VERSION_NUMBER=$(echo ${split[1]})" >> $GITHUB_OUTPUT echo "version_number=${split[1]}" >> $GITHUB_OUTPUT
- 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
@ -68,6 +72,9 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
env: env:
MACOS_APP_RELEASE_PATH: build/macos/Build/Products/Release MACOS_APP_RELEASE_PATH: build/macos/Build/Products/Release
outputs:
VERSION_NAME: ${{ steps.save_version.outputs.version_name }}
VERSION_NUMBER: ${{ steps.save_version.outputs.version_number }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Decode .env - name: Decode .env
@ -79,13 +86,14 @@ jobs:
file: './pubspec.yaml' file: './pubspec.yaml'
key-path: '["version"]' key-path: '["version"]'
- name: Save version on env variable - name: Save version on env variable
id: save_version
run: | run: |
version=${{ steps.read_pubspec.outputs.data }} version=${{ steps.read_pubspec.outputs.data }}
IFS='+' IFS='+'
read -r -a split <<< "$version" read -r -a split <<< "$version"
echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_ENV echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_ENV
echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_OUTPUT echo "version_name=${split[0]}" >> $GITHUB_OUTPUT
echo "VERSION_NUMBER=$(echo ${split[1]})" >> $GITHUB_OUTPUT echo "version_number=${split[1]}" >> $GITHUB_OUTPUT
- uses: subosito/flutter-action@v2 - uses: subosito/flutter-action@v2
with: with:
channel: "stable" channel: "stable"
@ -124,6 +132,9 @@ jobs:
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
outputs:
VERSION_NAME: ${{ steps.save_version.outputs.version_name }}
VERSION_NUMBER: ${{ steps.save_version.outputs.version_number }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Decode .env - name: Decode .env
@ -135,13 +146,14 @@ jobs:
file: './pubspec.yaml' file: './pubspec.yaml'
key-path: '["version"]' key-path: '["version"]'
- name: Save version on env variable - name: Save version on env variable
id: save_version
run: | run: |
version=${{ steps.read_pubspec.outputs.data }} version=${{ steps.read_pubspec.outputs.data }}
IFS='+' IFS='+'
read -r -a split <<< "$version" read -r -a split <<< "$version"
echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_ENV echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_ENV
echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_OUTPUT echo "version_name=${split[0]}" >> $GITHUB_OUTPUT
echo "VERSION_NUMBER=$(echo ${split[1]})" >> $GITHUB_OUTPUT echo "version_number=${split[1]}" >> $GITHUB_OUTPUT
- name: Update version in debian.yaml - name: Update version in debian.yaml
run: sed -i 's/<REPLACE_VERSION_NUMBER_ACTIONS>/${{ env.VERSION_NAME }}/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
@ -181,6 +193,9 @@ jobs:
build-windows: build-windows:
name: Build Windows installer name: Build Windows installer
runs-on: windows-latest runs-on: windows-latest
outputs:
VERSION_NAME: ${{ steps.save_version.outputs.version_name }}
VERSION_NUMBER: ${{ steps.save_version.outputs.version_number }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Decode .env - name: Decode .env
@ -195,13 +210,14 @@ jobs:
key-path: '["version"]' key-path: '["version"]'
- name: Save version on env variable - name: Save version on env variable
shell: bash shell: bash
id: save_version
run: | run: |
version=${{ steps.read_pubspec.outputs.data }} version=${{ steps.read_pubspec.outputs.data }}
IFS='+' IFS='+'
read -r -a split <<< "$version" read -r -a split <<< "$version"
echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_ENV echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_ENV
echo "VERSION_NAME=$(echo ${split[0]})" >> $GITHUB_OUTPUT echo "version_name=${split[0]}" >> $GITHUB_OUTPUT
echo "VERSION_NUMBER=$(echo ${split[1]})" >> $GITHUB_OUTPUT echo "version_number=${split[1]}" >> $GITHUB_OUTPUT
- name: Update version in innosetup config file - name: Update version in innosetup config file
shell: pwsh shell: pwsh
run: | run: |
@ -226,8 +242,8 @@ jobs:
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: env:
VERSION_NAME: ${{ needs.build-android.outputs.version_name }} VERSION_NAME: ${{ needs.build-android.outputs.VERSION_NAME }}
VERSION_NUMBER: ${{ needs.build-android.outputs.version_number }} 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
@ -267,7 +283,7 @@ jobs:
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: env:
VERSION_NAME: ${{ needs.build-android.outputs.version_name }} 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