From fb605050089ae6c606f0d40edd50ebe4af7e8ec5 Mon Sep 17 00:00:00 2001
From: Luke Ceddia <git@alephc.xyz>
Date: Mon, 6 Jan 2020 18:47:40 +1100
Subject: [PATCH] Merge MacOS deployment

---
 .github/workflows/run.yml | 40 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
index f3de73eec..a3f96904d 100644
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - githubactions
+      - development
 
 jobs:
   macos-build:
@@ -27,3 +27,41 @@ jobs:
     - name: Package and deploy
       if: github.event_name == 'push'
       run: .ci/deploy.sh osx
+
+  linux-build:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install dependencies
+      run: sudo apt update && sudo apt install libglu1-mesa-dev libncurses-dev
+    - name: Bootstrap compiler
+      run: .ci/bootstrap.sh lnx
+    - name: Compile
+      run: .ci/compile.sh
+    - name: Update source
+      if: github.event_name == 'push'
+      run: .ci/update-source.sh
+    - name: Push to repository
+      if: github.event_name == 'push'
+      uses: ad-m/github-push-action@19caa5c351f47734055690f7d01aaaef2f9114d5
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        branch: githubactions
+    - name: Set deployment SSH key
+      if: github.event_name == 'push'
+      uses: shimataro/ssh-key-action@v1
+      with:
+        private-key: ${{ secrets.SSH_KEY }}
+        public-key: ${{ secrets.SSH_KEY_PUBLIC }}
+        known-hosts: "qb64.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtmlTks7NPQHwvQiW+P2P8voWXfwYD+EuU39ERiaVw5g/lG/6pU1SKdrRBg2AtaPToPgK/nQyaid3sO2aWO00ixiKB3JPJoVp3nRY8YFi/AtVtVot/xh6+39fjP59tMCnMCbXTKjyMWL0kkwzd+OT8wryRZ/EgjK3vk9UGYzxKSr8G/KKV3GBDrJOdpHT2gNUcDFg6HSMvM860ZOF8n6jKRwp7MM0SpptufuQDgj/LhHcqQtFOqkhW9HXNmZR7IPchb5tsUubbPdSLu043B0ir2x5sCkK9V+inZExPg7KwIZ0yRsSv5esgLaBdyf1UToU3LU4ZM1hWjcJsp2fCBRkhw=="
+        config: |
+          Host remote-server
+          HostName qb64.org
+          User m6rosupy1q2t
+    - name: Package and deploy
+      if: github.event_name == 'push'
+      run: .ci/deploy.sh
+
+
+