👷 Reusable workflow

.github/workflows/build-apk.yml

@@ -22,30 +22,9 @@ concurrency:
   cancel-in-progress: true
 jobs:
   build-apk:
-    name: APK Build
+    uses: ./.github/workflows/build-artifact.yml
-    runs-on: ubuntu-latest
+    secrets:
-    timeout-minutes: 10
+      ENVS: ${{ secrets.ENVS }}
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v3
-
-      - name: Update Env for custom build
-        run: |
-          echo "${{ secrets.ENVS }}" >> .env
-
-      - name: Build Revanced APKs
-        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

.github/workflows/build-artifact.yml

@@ -1,18 +1,21 @@
-name: Build Artifacts PR
+name: Build Revanced APK
 env:
   DOCKER_BUILDKIT: 1
   COMPOSE_DOCKER_CLI_BUILD: 1
 on:
   workflow_call:
+    secrets:
+      ENVS:
+        required: false
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 jobs:
-  build-apk-pr:
+  build-apk:
     name: APK Build
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    timeout-minutes: 10
 
     steps:
       - name: Check out Git repository
@@ -26,15 +29,10 @@ jobs:
         run: |
           docker-compose up
 
-      - name: Get Date
+      - name: Upload Build APKS
-        id: get-date
-        run: |
-          echo ::set-output name=date::$(TZ='Asia/Kolkata' date +"%Y.%m.%d-%H.%M.%S")
-
-      - name: Upload Build Artifact
         uses: actions/upload-artifact@v3
         with:
-          name: Build APKs
+          name: Built-APKs
           path: |
             apks/*-output.apk
             apks/VancedMicroG.apk"

.github/workflows/codeql-analysis.yml

@@ -19,16 +19,16 @@ jobs:
         language: [ 'python' ]
 
     steps:
-    - name: Checkout repository
+      - name: Checkout repository
-      uses: actions/checkout@v3
+        uses: actions/checkout@v3
 
-    - name: Initialize CodeQL
+      - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v2
-      with:
+        with:
-        languages: ${{ matrix.language }}
+          languages: ${{ matrix.language }}
 
-    - name: Autobuild
+      - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v2
 
-    - name: Perform CodeQL Analysis
+      - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v2

.github/workflows/pr-checks.yml

@@ -11,4 +11,4 @@ jobs:
   linter-pr-check:
     uses: ./.github/workflows/linter.yml
   build-apk-pr-check:
-    uses: ./.github/workflows/build-apk-artifact.yml
+    uses: ./.github/workflows/build-artifact.yml