diff --git a/.gitea/workflows/build-and-release.yaml b/.gitea/workflows/build-and-release.yaml
deleted file mode 100644
index 5c676e775..000000000
--- a/.gitea/workflows/build-and-release.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Build and Release APK
-on:
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    name: Build and Upload APK
-    runs-on: ubuntu-latest
-    container:
-      image: 'cimg/android:2024.04-node'
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Build APKs
-        shell: bash
-        run: ./gradlew assembleDebug
-
-      - name: Upload to Gitea Releases
-        uses: ncipollo/release-action@v1
-        with:
-          tag: latest
-          name: "Latest Build (main)"
-          prerelease: true
-          allowUpdates: true
-          artifacts: "build/outputs/apk/**/*.apk"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
new file mode 100644
index 000000000..6fd72fb60
--- /dev/null
+++ b/.gitea/workflows/ci.yaml
@@ -0,0 +1,69 @@
+name: CI Pipeline
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+permissions:
+  contents: write
+
+jobs:
+  lint:
+    name: Android Lint
+    runs-on: ubuntu-latest
+    container:
+      image: 'cimg/android:2024.04-node'
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Lint
+        shell: bash
+        run: ./gradlew lint
+
+  android-check:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    container:
+      image: 'cimg/android:2024.04-node'
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Test
+        shell: bash
+        run: ./gradlew testNightlyDebugUnitTest --stacktrace
+
+  release:
+    name: Build and Upload APK
+    needs: [lint, android-check]
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+    container:
+      image: 'cimg/android:2024.04-node'
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Build APKs
+        shell: bash
+        run: ./gradlew assembleDebug
+
+      - name: Upload to Gitea Releases
+        uses: ncipollo/release-action@v1
+        with:
+          tag: latest
+          name: "Latest Build (main)"
+          prerelease: true
+          allowUpdates: true
+          artifacts: "build/outputs/apk/**/*.apk"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml
deleted file mode 100644
index ff21a74ee..000000000
--- a/.gitea/workflows/test.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Android Test
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-
-jobs:
-  lint:
-    name: Android Lint
-    runs-on: ubuntu-latest
-    container:
-      image: 'cimg/android:2024.04-node'
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Lint
-        shell: bash
-        run: ./gradlew lint
-
-  android-check:
-    runs-on: ubuntu-latest
-    container:
-      image: 'cimg/android:2024.04-node'
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Test
-        shell: bash
-        run: ./gradlew testNightlyDebugUnitTest --stacktrace