From 4daf4a8d538b9ee3dfe2fc8002d8472eb67433f3 Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Mon, 4 Jan 2021 00:32:59 +0000
Subject: [PATCH 01/10] Create ubuntu-build-and-test.yml

---
 .github/workflows/ubuntu-build-and-test.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/workflows/ubuntu-build-and-test.yml

diff --git a/.github/workflows/ubuntu-build-and-test.yml b/.github/workflows/ubuntu-build-and-test.yml
new file mode 100644
index 000000000..8967451c9
--- /dev/null
+++ b/.github/workflows/ubuntu-build-and-test.yml
@@ -0,0 +1,12 @@
+name: Ubuntu Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: make all
+      run: make all

From e3119abd98373dee8b0900f4e280a0b00a371e84 Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Mon, 4 Jan 2021 00:38:58 +0000
Subject: [PATCH 02/10] Install deps on ubuntu builder

Stolen from https://gitlab.com/mirrorbuilds/ci-configs/-/blob/master/iceman-pm3/.gitlab-ci.yml by @linuxgemini
---
 .github/workflows/ubuntu-build-and-test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ubuntu-build-and-test.yml b/.github/workflows/ubuntu-build-and-test.yml
index 8967451c9..adecebcb8 100644
--- a/.github/workflows/ubuntu-build-and-test.yml
+++ b/.github/workflows/ubuntu-build-and-test.yml
@@ -8,5 +8,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: Install dependencies
+      run: apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
     - name: make all
       run: make all

From cc9b80915117827f4f84a44f55424d8e1689aa4f Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Mon, 4 Jan 2021 00:44:41 +0000
Subject: [PATCH 03/10] sudo

---
 .github/workflows/ubuntu-build-and-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ubuntu-build-and-test.yml b/.github/workflows/ubuntu-build-and-test.yml
index adecebcb8..86e8dd0a8 100644
--- a/.github/workflows/ubuntu-build-and-test.yml
+++ b/.github/workflows/ubuntu-build-and-test.yml
@@ -9,6 +9,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies
-      run: apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
+      run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
     - name: make all
       run: make all

From 37791bbbf84232cab6dbfc9782f509a47546afb5 Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Mon, 4 Jan 2021 00:46:28 +0000
Subject: [PATCH 04/10] Update and upgrade before installing deps

---
 .github/workflows/ubuntu-build-and-test.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ubuntu-build-and-test.yml b/.github/workflows/ubuntu-build-and-test.yml
index 86e8dd0a8..3ec11b05a 100644
--- a/.github/workflows/ubuntu-build-and-test.yml
+++ b/.github/workflows/ubuntu-build-and-test.yml
@@ -8,6 +8,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: Update apt repos
+      run: sudo apt-get update
+    - name: Update packages
+      run: sudo apt-get upgrade -yqq
     - name: Install dependencies
       run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
     - name: make all

From 2d6119b5cd4c19ee6b239f38ac5ed5480435032a Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Mon, 4 Jan 2021 00:57:05 +0000
Subject: [PATCH 05/10] Add tests to ubuntu CI

---
 .github/workflows/ubuntu-build-and-test.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ubuntu-build-and-test.yml b/.github/workflows/ubuntu-build-and-test.yml
index 3ec11b05a..8bc11dbbf 100644
--- a/.github/workflows/ubuntu-build-and-test.yml
+++ b/.github/workflows/ubuntu-build-and-test.yml
@@ -14,5 +14,7 @@ jobs:
       run: sudo apt-get upgrade -yqq
     - name: Install dependencies
       run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
-    - name: make all
-      run: make all
+    - name: Build
+      run: make clean && make V=1
+    - name: Test
+      run: make check

From fdb28dd95e287ab00b2381114ecc609f50b2b81d Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Mon, 4 Jan 2021 04:05:19 +0300
Subject: [PATCH 06/10] github actions: add macos action

---
 .github/workflows/macos-build-and-test.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/macos-build-and-test.yml

diff --git a/.github/workflows/macos-build-and-test.yml b/.github/workflows/macos-build-and-test.yml
new file mode 100644
index 000000000..dff98dd2d
--- /dev/null
+++ b/.github/workflows/macos-build-and-test.yml
@@ -0,0 +1,22 @@
+name: MacOS Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update brew repos
+      run: brew update
+    - name: Update packages
+      run: brew upgrade
+    - name: Tap RfidResearchGroup/proxmark3
+      run: brew tap RfidResearchGroup/proxmark3
+    - name: Install dependencies
+      run: readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+    - name: Build
+      run: make clean && make V=1
+    - name: Test
+      run: make check

From 7db332a6de4bf2f4abe62b9dca7aebf187fe96c8 Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Mon, 4 Jan 2021 04:13:27 +0300
Subject: [PATCH 07/10] gh actions: Add ubuntu with make w/ btaddon and cmake

---
 .../{macos-build-and-test.yml => macos.yml}   |  0
 .github/workflows/ubuntu-cmake.yml            | 20 +++++++++++++++++++
 .github/workflows/ubuntu-make-btaddon.yml     | 20 +++++++++++++++++++
 ...ntu-build-and-test.yml => ubuntu-make.yml} |  4 ++--
 4 files changed, 42 insertions(+), 2 deletions(-)
 rename .github/workflows/{macos-build-and-test.yml => macos.yml} (100%)
 create mode 100644 .github/workflows/ubuntu-cmake.yml
 create mode 100644 .github/workflows/ubuntu-make-btaddon.yml
 rename .github/workflows/{ubuntu-build-and-test.yml => ubuntu-make.yml} (92%)

diff --git a/.github/workflows/macos-build-and-test.yml b/.github/workflows/macos.yml
similarity index 100%
rename from .github/workflows/macos-build-and-test.yml
rename to .github/workflows/macos.yml
diff --git a/.github/workflows/ubuntu-cmake.yml b/.github/workflows/ubuntu-cmake.yml
new file mode 100644
index 000000000..539ac252d
--- /dev/null
+++ b/.github/workflows/ubuntu-cmake.yml
@@ -0,0 +1,20 @@
+name: Ubuntu (cmake) Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update apt repos
+      run: sudo apt-get update
+    - name: Update packages
+      run: sudo apt-get upgrade -yqq
+    - name: Install dependencies
+      run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
+    - name: Build
+      run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 )
+    - name: Test
+      run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3"
diff --git a/.github/workflows/ubuntu-make-btaddon.yml b/.github/workflows/ubuntu-make-btaddon.yml
new file mode 100644
index 000000000..e8de696a7
--- /dev/null
+++ b/.github/workflows/ubuntu-make-btaddon.yml
@@ -0,0 +1,20 @@
+name: Ubuntu (make with BTADDON) Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update apt repos
+      run: sudo apt-get update
+    - name: Update packages
+      run: sudo apt-get upgrade -yqq
+    - name: Install dependencies
+      run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
+    - name: Build
+      run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON
+    - name: Test
+      run: make check
diff --git a/.github/workflows/ubuntu-build-and-test.yml b/.github/workflows/ubuntu-make.yml
similarity index 92%
rename from .github/workflows/ubuntu-build-and-test.yml
rename to .github/workflows/ubuntu-make.yml
index 8bc11dbbf..958c9c35d 100644
--- a/.github/workflows/ubuntu-build-and-test.yml
+++ b/.github/workflows/ubuntu-make.yml
@@ -1,9 +1,9 @@
-name: Ubuntu Build and Test
+name: Ubuntu (make) Build and Test
 
 on: [push, pull_request]
 
 jobs:
-  build:
+  build-and-test:
     runs-on: ubuntu-latest
 
     steps:

From 3dfc068a284e4f49a7aa528983e0f6ba3f097f89 Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Mon, 4 Jan 2021 04:15:54 +0300
Subject: [PATCH 08/10] github actions: macos bugfix

---
 .github/workflows/macos.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index dff98dd2d..ff72a0e3d 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -8,9 +8,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: Brew python bug workaround
+      run: brew link --overwrite python
     - name: Update brew repos
       run: brew update
-    - name: Update packages
+    - name: Upgrade packages
       run: brew upgrade
     - name: Tap RfidResearchGroup/proxmark3
       run: brew tap RfidResearchGroup/proxmark3

From 96127e0da3447bd93a50288990857834aacf9327 Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Mon, 4 Jan 2021 04:17:58 +0300
Subject: [PATCH 09/10] github actions: don't upgrade packages

---
 .github/workflows/macos.yml               | 4 +---
 .github/workflows/ubuntu-cmake.yml        | 2 --
 .github/workflows/ubuntu-make-btaddon.yml | 2 --
 .github/workflows/ubuntu-make.yml         | 2 --
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ff72a0e3d..3eb0b8584 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -12,12 +12,10 @@ jobs:
       run: brew link --overwrite python
     - name: Update brew repos
       run: brew update
-    - name: Upgrade packages
-      run: brew upgrade
     - name: Tap RfidResearchGroup/proxmark3
       run: brew tap RfidResearchGroup/proxmark3
     - name: Install dependencies
-      run: readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
     - name: Build
       run: make clean && make V=1
     - name: Test
diff --git a/.github/workflows/ubuntu-cmake.yml b/.github/workflows/ubuntu-cmake.yml
index 539ac252d..dd99487f1 100644
--- a/.github/workflows/ubuntu-cmake.yml
+++ b/.github/workflows/ubuntu-cmake.yml
@@ -10,8 +10,6 @@ jobs:
     - uses: actions/checkout@v2
     - name: Update apt repos
       run: sudo apt-get update
-    - name: Update packages
-      run: sudo apt-get upgrade -yqq
     - name: Install dependencies
       run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
     - name: Build
diff --git a/.github/workflows/ubuntu-make-btaddon.yml b/.github/workflows/ubuntu-make-btaddon.yml
index e8de696a7..0e11f01c3 100644
--- a/.github/workflows/ubuntu-make-btaddon.yml
+++ b/.github/workflows/ubuntu-make-btaddon.yml
@@ -10,8 +10,6 @@ jobs:
     - uses: actions/checkout@v2
     - name: Update apt repos
       run: sudo apt-get update
-    - name: Update packages
-      run: sudo apt-get upgrade -yqq
     - name: Install dependencies
       run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
     - name: Build
diff --git a/.github/workflows/ubuntu-make.yml b/.github/workflows/ubuntu-make.yml
index 958c9c35d..f4f7d0113 100644
--- a/.github/workflows/ubuntu-make.yml
+++ b/.github/workflows/ubuntu-make.yml
@@ -10,8 +10,6 @@ jobs:
     - uses: actions/checkout@v2
     - name: Update apt repos
       run: sudo apt-get update
-    - name: Update packages
-      run: sudo apt-get upgrade -yqq
     - name: Install dependencies
       run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0-dbg liblua5.2-0 lua5.2 sed
     - name: Build

From 4a6b2d4390a4666e5208c4a8da3ae37ea68315fa Mon Sep 17 00:00:00 2001
From: Ave <ave@ave.zone>
Date: Mon, 4 Jan 2021 04:26:56 +0300
Subject: [PATCH 10/10] github actions: Introduce build variants for macos too

---
 .github/workflows/macos-cmake.yaml            | 20 +++++++++++++++++++
 .github/workflows/macos-make-btaddon.yml      | 20 +++++++++++++++++++
 .../workflows/{macos.yml => macos-make.yml}   |  4 +---
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/macos-cmake.yaml
 create mode 100644 .github/workflows/macos-make-btaddon.yml
 rename .github/workflows/{macos.yml => macos-make.yml} (81%)

diff --git a/.github/workflows/macos-cmake.yaml b/.github/workflows/macos-cmake.yaml
new file mode 100644
index 000000000..8c6a41f37
--- /dev/null
+++ b/.github/workflows/macos-cmake.yaml
@@ -0,0 +1,20 @@
+name: MacOS (cmake) Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update brew repos
+      run: brew update
+    - name: Tap RfidResearchGroup/proxmark3
+      run: brew tap RfidResearchGroup/proxmark3
+    - name: Install dependencies
+      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+    - name: Build
+      run: mkdir -p client/build && ( cd client/build && cmake .. && make VERBOSE=1 )
+    - name: Test
+      run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3"
diff --git a/.github/workflows/macos-make-btaddon.yml b/.github/workflows/macos-make-btaddon.yml
new file mode 100644
index 000000000..9d5b75ff7
--- /dev/null
+++ b/.github/workflows/macos-make-btaddon.yml
@@ -0,0 +1,20 @@
+name: MacOS (make with BTADDON) Build and Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Update brew repos
+      run: brew update
+    - name: Tap RfidResearchGroup/proxmark3
+      run: brew tap RfidResearchGroup/proxmark3
+    - name: Install dependencies
+      run: brew install readline qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc
+    - name: Build
+      run: make clean && make V=1 PLATFORM_EXTRAS=BTADDON
+    - name: Test
+      run: make check
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos-make.yml
similarity index 81%
rename from .github/workflows/macos.yml
rename to .github/workflows/macos-make.yml
index 3eb0b8584..a612bcda2 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos-make.yml
@@ -1,4 +1,4 @@
-name: MacOS Build and Test
+name: MacOS (make) Build and Test
 
 on: [push, pull_request]
 
@@ -8,8 +8,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Brew python bug workaround
-      run: brew link --overwrite python
     - name: Update brew repos
       run: brew update
     - name: Tap RfidResearchGroup/proxmark3