From aad00e976b640802ac33a1b55bbd898a53fb2625 Mon Sep 17 00:00:00 2001
From: Albin <albin@mullvad.net>
Date: Tue, 3 Sep 2024 10:34:25 +0200
Subject: [PATCH] Add container wrapper android build workflow

---
 .github/workflows/android-app-wrapper.yml | 32 +++++++++++++++++++++++
 building/container-run.sh                 |  4 ---
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/android-app-wrapper.yml

diff --git a/.github/workflows/android-app-wrapper.yml b/.github/workflows/android-app-wrapper.yml
new file mode 100644
index 000000000000..f86179547461
--- /dev/null
+++ b/.github/workflows/android-app-wrapper.yml
@@ -0,0 +1,32 @@
+---
+name: Android - Wrapper build
+on:
+  workflow_dispatch:
+  pull_request:
+
+permissions: {}
+
+jobs:
+  build-app:
+    name: Build app (using wrapper)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Checkout wireguard-go-rs recursively
+        run: |
+          git config --global --add safe.directory '*'
+          git submodule update --init --recursive --depth=1 wireguard-go-rs
+
+      - name: Install podman
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install podman
+
+      - name: Run build script
+        shell: bash
+        run: ./building/containerized-build.sh android --dev-build
diff --git a/building/container-run.sh b/building/container-run.sh
index 639c71133286..a18aa0ddb9ab 100755
--- a/building/container-run.sh
+++ b/building/container-run.sh
@@ -55,8 +55,4 @@ fi
 set -x
 exec "$CONTAINER_RUNNER" run --rm -it \
     -v "$REPO_DIR:$REPO_MOUNT_TARGET:Z" \
-    -v "$CARGO_TARGET_VOLUME_NAME:/cargo-target:Z" \
-    -v "$CARGO_REGISTRY_VOLUME_NAME:/root/.cargo/registry:Z" \
-    "${optional_gradle_cache_volume[@]}" \
-    "${optional_android_credentials_volume[@]}" \
     "$container_image_name" bash -c "$optional_mold $*"