From 5d8919e2b5213e3802d9916deedb902755b2056a Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Thu, 3 Aug 2023 12:48:58 -0400
Subject: [PATCH] Automatically build debs

---
 .github/workflows/build.yml | 21 ++++++++++++++++++++-
 Makefile                    | 17 -----------------
 2 files changed, 20 insertions(+), 18 deletions(-)
 delete mode 100644 Makefile

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3d13a42..ed36fe8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build_and_test:
-    name: Run Tests
+    name: Build & Test
 
     # Use a build matrix to run this job targeting all supported platforms
     runs-on: ubuntu-latest
@@ -33,6 +33,12 @@ jobs:
           toolchain: ${{ matrix.rust_channel }}
           override: true
 
+      - name: Install cargo-deb
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: cargo-deb
+
       - name: Compile
         uses: actions-rs/cargo@v1
         with:
@@ -46,3 +52,16 @@ jobs:
           use-cross: true
           command: test
           args: --all --release --target ${{ matrix.target }}
+      
+      - name: Package DEB
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: false
+          command: deb
+          args: --target ${{ matrix.target }} --no-build
+
+      - name: Upload DEB
+        uses: actions/upload-artifact@v3
+        with:
+          name: debian-packages
+          path: target/${{ matrix.target }}/debian/*.deb
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f2b9397..0000000
--- a/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# All sources used to build the protomask binary
-SRC = Cargo.toml $(shell find src/ -type f -name '*.rs') $(shell find protomask-tun/src/ -type f -name '*.rs')
-
-# Used to auto-version things
-CRATE_VERSION = $(shell sed -n -r "s/^version = \"([0-9\.]+)\"/\1/p" Cargo.toml)
-
-target/x86_64-unknown-linux-musl/release/protomask: $(SRC)
-	cross build --target x86_64-unknown-linux-musl --release
-
-target/aarch64-unknown-linux-musl/release/protomask: $(SRC)
-	cross build --target aarch64-unknown-linux-musl --release
-
-target/x86_64-unknown-linux-musl/debian/protomask_${CRATE_VERSION}_amd64.deb: target/x86_64-unknown-linux-musl/release/protomask
-	cargo deb --target x86_64-unknown-linux-musl --no-build
-
-target/aarch64-unknown-linux-musl/debian/protomask_${CRATE_VERSION}_arm64.deb: target/aarch64-unknown-linux-musl/release/protomask
-	cargo deb --target aarch64-unknown-linux-musl --no-build