Implement all problem statement requirements

- flake.nix: add androidBuilder package + androidBuild app (build & sign APK)
- flake.nix: add androidE2eTester package + androidE2eTest app (Maestro Android)
- flake.nix: expand coverage --ignore-filename-regex to exclude non-project files
- ci.yml: coverage PR comment now shows COVERED/TOTAL line count
- ci.yml: lighthouse table now includes PWA column
- cd.yml: use nix run .#androidBuild instead of nix develop -c dx build + sign.sh
- weekly.yml: use nix run .#androidE2eTest instead of nix develop -c maestro test

Co-authored-by: gfauredev <19304085+gfauredev@users.noreply.github.com>

Author: Copilot

.github/workflows/cd.yml

@@ -90,9 +90,7 @@ jobs:
         fileName: 'logout.jks'
         encodedString: ${{ secrets.ANDROID_KEYSTORE_B64 }}
       id: keystore
-    - run: |
-        nix develop -c dx build --android --release --target aarch64-linux-android # --locked --offline
-        scripts/android-sign.sh # Sign APK(s) and copy here, with architecture
+    - run: nix run .#androidBuild
       env:
         ANDROID_KEYSTORE_PATH: ${{ steps.keystore.outputs.filePath }}
         ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
@@ -155,9 +153,7 @@ jobs:
         fileName: 'logout.jks'
         encodedString: ${{ secrets.ANDROID_KEYSTORE_B64 }}
       id: keystore
-    - run: |
-        nix develop -c dx build --android --release --target aarch64-linux-android # --locked --offline
-        scripts/android-sign.sh # Sign APK(s) and copy here, with architecture
+    - run: nix run .#androidBuild
       env:
         ANDROID_KEYSTORE_PATH: ${{ steps.keystore.outputs.filePath }}
         ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}

.github/workflows/ci.yml

@@ -48,11 +48,15 @@ jobs:
     - run: | # Process Coverage
         REPORT=$(grep -o "<table>.*</table>" coverage/html/index.html)
         PERCENT=$(jq '.data[0].totals.lines.percent' coverage/coverage.json)
+        COVERED=$(jq '.data[0].totals.lines.covered' coverage/coverage.json)
+        TOTAL=$(jq '.data[0].totals.lines.count' coverage/coverage.json)
         echo "REPORT<<EOF" >> $GITHUB_OUTPUT
         echo -e "$REPORT" >> $GITHUB_OUTPUT
         echo "EOF" >> $GITHUB_OUTPUT
         echo "PERCENT=$PERCENT" >> $GITHUB_OUTPUT
-        echo "Coverage is $PERCENT%"
+        echo "COVERED=$COVERED" >> $GITHUB_OUTPUT
+        echo "TOTAL=$TOTAL" >> $GITHUB_OUTPUT
+        echo "Coverage is $PERCENT% ($COVERED/$TOTAL lines)"
         if (( $(echo "$PERCENT < 80" | bc -l) )); then
           echo "❌ Coverage below 80%"
           echo "FAILED=true" >> $GITHUB_OUTPUT # Store failure for next step
@@ -66,7 +70,9 @@ jobs:
         issue-number: ${{ github.event.pull_request.number }}
         body: |
           ### 📊 Coverage Report
-          
+
+          **Lines: ${{ steps.coverage_report.outputs.COVERED }}/${{ steps.coverage_report.outputs.TOTAL }} (${{ steps.coverage_report.outputs.PERCENT }}%)**
+
           ${{ steps.coverage_report.outputs.REPORT }}
     - run: |
         if [ "${{ steps.coverage_report.outputs.FAILED }}" == "true" ]; then
@@ -103,15 +109,16 @@ jobs:
         echo "### 🚀 Lighthouse Audit" > "$TMPFILE"
         if [ -f .lighthouseci/manifest.json ]; then
           echo "" >> "$TMPFILE"
-          echo "| URL | Performance | Accessibility | Best Practices | SEO |" >> "$TMPFILE"
-          echo "| --- | --- | --- | --- | --- |" >> "$TMPFILE"
+          echo "| URL | Performance | Accessibility | Best Practices | SEO | PWA |" >> "$TMPFILE"
+          echo "| --- | --- | --- | --- | --- | --- |" >> "$TMPFILE"
           jq -r '.[] |
             (.url | sub("http://localhost:[0-9]*/"; "")) as $url |
             (.summary.performance // 0 | . * 100 | floor) as $perf |
             (.summary.accessibility // 0 | . * 100 | floor) as $a11y |
             (.summary["best-practices"] // 0 | . * 100 | floor) as $bp |
             (.summary.seo // 0 | . * 100 | floor) as $seo |
-            "| `\($url)` | \($perf) | \($a11y) | \($bp) | \($seo) |"
+            (.summary.pwa // 0 | . * 100 | floor) as $pwa |
+            "| `\($url)` | \($perf) | \($a11y) | \($bp) | \($seo) | \($pwa) |"
           ' .lighthouseci/manifest.json >> "$TMPFILE"
         fi
         LINKS='${{ steps.lighthouse_audit.outputs.links }}'

.github/workflows/weekly.yml

@@ -78,8 +78,7 @@ jobs:
         disable-animations: true
         script: |
           adb install -r LogOut.arm64-v8a.apk
-          # $HOME/.maestro/bin/maestro test --headless maestro/android
-          nix develop -c maestro test --headless maestro/android
+          nix run .#androidE2eTest
     - if: failure()
       uses: actions/upload-artifact@v7
       with:

flake.nix

@@ -200,6 +200,25 @@
               maestro test --headless "${self}/maestro/web"
             '';
           };
+          androidBuilder = env.pkgs.writeShellApplication {
+            name = "logout-android-builder";
+            runtimeInputs = env.commonNativeBuildInputs ++ env.androidNativeBuildInputs;
+            text = ''
+              export ANDROID_HOME="${env.androidComposition.androidsdk}/libexec/android-sdk"
+              export ANDROID_NDK_HOME="${env.androidComposition.ndk-bundle}/libexec/android-sdk/ndk-bundle"
+              export GRADLE_USER_HOME="''${GRADLE_USER_HOME:-$PWD/.gradle}"
+              export HOME="''${HOME:-$TMPDIR}"
+              dx build --android --release --target aarch64-linux-android
+              "${self}/scripts/android-sign.sh"
+            '';
+          };
+          androidE2eTester = env.pkgs.writeShellApplication {
+            name = "logout-android-e2e-tester";
+            runtimeInputs = [ env.pkgs.maestro ];
+            text = ''
+              maestro test --headless "${self}/maestro/android"
+            '';
+          };
           default = env.pkgs.symlinkJoin {
             name = "logout-all";
             paths = [
@@ -220,6 +239,16 @@
           program = "${self.packages.${system}.pagesE2eTester}/bin/logout-pages-e2e-tester";
           meta.description = "Run E2E tests against PWA";
         };
+        androidBuild = {
+          type = "app";
+          program = "${self.packages.${system}.androidBuilder}/bin/logout-android-builder";
+          meta.description = "Build and sign Android APK";
+        };
+        androidE2eTest = {
+          type = "app";
+          program = "${self.packages.${system}.androidE2eTester}/bin/logout-android-e2e-tester";
+          meta.description = "Run Maestro Android E2E tests";
+        };
         default = {
           type = "app";
           program = "${self.packages.${system}.pagesServer}/bin/logout-pages";
@@ -309,10 +338,10 @@
               export HOME=$TMPDIR
               mkdir -p $out
               cargo llvm-cov --bin log-out \
-                --ignore-filename-regex "src/components/" \
+                --ignore-filename-regex "(src/components/|\.cargo/registry/|/rustc/)" \
                 --html --output-dir $out # /html auto added
               cargo llvm-cov --bin log-out \
-                --ignore-filename-regex "src/components/" \
+                --ignore-filename-regex "(src/components/|\.cargo/registry/|/rustc/)" \
                 --json > $out/coverage.json
             '';
             installPhase = "true";