diff --git a/.github/workflows/build-apk.yml b/.github/workflows/build-apk.yml index 7d1fdae..6e18d81 100644 --- a/.github/workflows/build-apk.yml +++ b/.github/workflows/build-apk.yml @@ -13,7 +13,7 @@ jobs: build-apk: name: APK Build runs-on: ubuntu-latest - timeout-minutes: 20 + timeout-minutes: 10 steps: - name: Check out Git repository @@ -27,6 +27,26 @@ jobs: run: | docker-compose up + - name: Upload Build APKS + uses: actions/upload-artifact@v3 + with: + name: Built-APKs + path: | + apks/*-output.apk + apks/VancedMicroG.apk" + if-no-files-found: error + + upload-to-github: + name: GitHub Upload + runs-on: ubuntu-latest + timeout-minutes: 5 + needs: build-apk + + steps: + - name: Download Already Built APKs + uses: actions/download-artifact@v3 + with: + name: Built-APKs - name: Get Date id: get-date run: | @@ -41,7 +61,7 @@ jobs: - name: Upload Build Artifact uses: ncipollo/release-action@v1.11.1 with: - artifacts: "apks/*-output.apk,apks/VancedMicroG.apk" + artifacts: "*-output.apk" token: ${{ secrets.GH_TOKEN }} tag: Build-${{ steps.get-date.outputs.date }} artifactErrorsFailBuild: true @@ -50,9 +70,16 @@ jobs: run: | sleep 10 + upload-to-telegram: + name: Telegram Upload + runs-on: ubuntu-latest + timeout-minutes: 5 + needs: [ build-apk,upload-to-github ] + + steps: - name: Upload to Telegram - if: ${{ env.HAVE_TELEGRAM_API_ID == 'true' }} uses: nikhilbadyal/ghaction-telegram-uploader@main + if: ${{ env.HAVE_TELEGRAM_API_ID == 'true' }} with: API_ID: ${{ secrets.TELEGRAM_API_ID }} API_HASH: ${{ secrets.TELEGRAM_API_HASH }} diff --git a/src/downloader.py b/src/downloader.py index 710fed6..bfd5a6b 100644 --- a/src/downloader.py +++ b/src/downloader.py @@ -168,7 +168,7 @@ class Downloader(object): ["revanced", "revanced-cli", self.config.normal_cli_jar], ["revanced", "revanced-integrations", self.config.normal_integrations_apk], ["revanced", "revanced-patches", self.config.normal_patches_jar], - ["inotia00", "VancedMicroG", "VancedMicroG.apk"], + ["inotia00", "VancedMicroG", "VancedMicroG-output.apk"], ] if self.config.build_extended: assets += [