From 7e5243bd7ba84188dc94eb4f8e937f6107b86736 Mon Sep 17 00:00:00 2001
From: drowaudio <drowland96@gmail.com>
Date: Wed, 20 Nov 2019 13:38:34 +0000
Subject: [PATCH 1/8] CI:   Added github CI Actions

---
 .github/workflows/ccpp.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .github/workflows/ccpp.yml

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
new file mode 100644
index 0000000..f4d6d1f
--- /dev/null
+++ b/.github/workflows/ccpp.yml
@@ -0,0 +1,14 @@
+name: C/C++ CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: macOS-latest
+    
+    steps:
+    - uses: actions/checkout@v1
+    - name: build
+      run: install/linux_build
+

From 8f2b61faa115ae8452635be8a43ffefaeb993c17 Mon Sep 17 00:00:00 2001
From: drowaudio <drowland96@gmail.com>
Date: Wed, 20 Nov 2019 13:40:19 +0000
Subject: [PATCH 2/8] CI:   Fixed mac_build

---
 .github/workflows/ccpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index f4d6d1f..7896b53 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -10,5 +10,5 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: build
-      run: install/linux_build
+      run: install/mac_build
 

From 464bc2d629cf5aa79df4a70cf830015ae97cf37e Mon Sep 17 00:00:00 2001
From: drowaudio <drowland96@gmail.com>
Date: Wed, 20 Nov 2019 13:42:30 +0000
Subject: [PATCH 3/8] CI:   Added submodule clones

---
 .github/workflows/ccpp.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 7896b53..0e9d502 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -9,6 +9,8 @@ jobs:
     
     steps:
     - uses: actions/checkout@v1
+      with:
+        submodules: true
     - name: build
       run: install/mac_build
 

From 0197ff70cf50ddbf466049bfc3acf3ce966d4866 Mon Sep 17 00:00:00 2001
From: drowaudio <drowland96@gmail.com>
Date: Wed, 20 Nov 2019 13:48:28 +0000
Subject: [PATCH 4/8] CI:   Added testing of macOS builds

---
 .github/workflows/ccpp.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 0e9d502..61e5e1b 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -13,4 +13,6 @@ jobs:
         submodules: true
     - name: build
       run: install/mac_build
+    - name: test
+      run: install/mac_tests
 

From 2fd0e66ed2c570fbbbe42abe1e8620bf4fb2e155 Mon Sep 17 00:00:00 2001
From: drowaudio <drowland96@gmail.com>
Date: Wed, 20 Nov 2019 16:15:02 +0000
Subject: [PATCH 5/8] CI:   Fixed mac_tests path

---
 .github/workflows/ccpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 61e5e1b..00dae2b 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -14,5 +14,5 @@ jobs:
     - name: build
       run: install/mac_build
     - name: test
-      run: install/mac_tests
+      run: tests/mac_tests
 

From fe2ebdbf5ee1a25018567826fd29f5f2bbcd629a Mon Sep 17 00:00:00 2001
From: David Rowland <drowland96@gmail.com>
Date: Fri, 22 Nov 2019 11:51:23 +0000
Subject: [PATCH 6/8] CI:   Testing install of certs

---
 .github/workflows/ccpp.yml      | 12 +++++++----
 install/mac_install_certificate | 38 +++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100755 install/mac_install_certificate

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 00dae2b..055d5ea 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -11,8 +11,12 @@ jobs:
     - uses: actions/checkout@v1
       with:
         submodules: true
-    - name: build
-      run: install/mac_build
-    - name: test
-      run: tests/mac_tests
+    - name: install certificates
+      run: |
+        install/mac_certificate ${{ secrets.APPLICATION_CERT }} ${{ secrets.APPLICATION_CERT_NAME }}
+        install/mac_certificate ${{ secrets.INSTALLER_CERT }} ${{ secrets.INSTALLER_CERT_NAME }}
+    # - name: build
+    #   run: install/mac_build
+    # - name: test
+    #   run: tests/mac_tests
 
diff --git a/install/mac_install_certificate b/install/mac_install_certificate
new file mode 100755
index 0000000..08580cd
--- /dev/null
+++ b/install/mac_install_certificate
@@ -0,0 +1,38 @@
+#!/bin/bash -e
+
+CERT_BASE64_STRING=$1
+CERT_FILE_NAME=$2
+
+if [ -z "$CERT_BASE64_STRING" ]; then
+	echo "CERT_BASE64_STRING needed as first arg!"
+	exit 1
+fi
+
+if [ -z "$CERT_FILE_NAME" ]; then
+	echo "CERT_FILE_NAME needed as second arg!"
+	exit 1
+fi
+
+#========================================================================
+# Create the cert file from the base 64 string arg
+CERT_BASE64_FILE="/tmp/$CERT_FILE_NAME"
+rm "$CERT_BASE64_FILE"
+touch "$CERT_BASE64_FILE"
+echo "$CERT_BASE64_STRING" > "$CERT_BASE64_FILE"
+
+#========================================================================
+# Make sure the cert file is cleaned up on exit
+function cleanup
+{
+	echo "Removing CERT_BASE64_FILE: $CERT_BASE64_FILE" 
+  	rm "$CERT_BASE64_FILE"
+}
+
+trap cleanup EXIT
+
+#========================================================================
+# Create a file from the base 64 file 
+openssl base64 -d -in "$CERT_BASE64_FILE" -out "$CERT_FILE_PATH"
+
+# Then import it in to the login keychain
+security import "$CERT_FILE_PATH" -k ~/Library/Keychains/login.keychain
\ No newline at end of file

From 6cd355f3e13478b94b7105c8b40bb335c5bd5b6a Mon Sep 17 00:00:00 2001
From: David Rowland <drowland96@gmail.com>
Date: Fri, 22 Nov 2019 11:53:30 +0000
Subject: [PATCH 7/8] CI:   Fixed script name

---
 .github/workflows/ccpp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 055d5ea..cc8a196 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -13,8 +13,8 @@ jobs:
         submodules: true
     - name: install certificates
       run: |
-        install/mac_certificate ${{ secrets.APPLICATION_CERT }} ${{ secrets.APPLICATION_CERT_NAME }}
-        install/mac_certificate ${{ secrets.INSTALLER_CERT }} ${{ secrets.INSTALLER_CERT_NAME }}
+        install/mac_install_certificate ${{ secrets.APPLICATION_CERT }} ${{ secrets.APPLICATION_CERT_NAME }}
+        install/mac_install_certificate ${{ secrets.INSTALLER_CERT }} ${{ secrets.INSTALLER_CERT_NAME }}
     # - name: build
     #   run: install/mac_build
     # - name: test

From 0152fda390a6493319e83ba39cf2744fa31622f7 Mon Sep 17 00:00:00 2001
From: David Rowland <drowland96@gmail.com>
Date: Fri, 22 Nov 2019 12:08:49 +0000
Subject: [PATCH 8/8] CI:   Quoted secret args

---
 .github/workflows/ccpp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index cc8a196..376a4e6 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -13,8 +13,8 @@ jobs:
         submodules: true
     - name: install certificates
       run: |
-        install/mac_install_certificate ${{ secrets.APPLICATION_CERT }} ${{ secrets.APPLICATION_CERT_NAME }}
-        install/mac_install_certificate ${{ secrets.INSTALLER_CERT }} ${{ secrets.INSTALLER_CERT_NAME }}
+        install/mac_install_certificate "${{ secrets.APPLICATION_CERT }}" "${{ secrets.APPLICATION_CERT_NAME }}"
+        install/mac_install_certificate "${{ secrets.INSTALLER_CERT }}" "${{ secrets.INSTALLER_CERT_NAME }}"
     # - name: build
     #   run: install/mac_build
     # - name: test