Merge pull request #255 from docsteer/master-workflows

Switch to using Github Actions for CI builds

.github/workflows/build.yml

@@ -0,0 +1,108 @@
+# Github Actions configuration file
+# Runs the build on Linux, Windows and MacOS
+name: Build
+
+on:
+  push:
+  pull_request:
+  page_build:
+  release:
+    types:
+      - created
+      - edited
+      - prereleased
+      - released
+
+jobs:
+  build_linux:
+  # Ubuntu Bionic
+    runs-on: ubuntu-18.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: Install Extra Packages
+      run: sudo apt-get install mesa-common-dev libgl1-mesa-dev libpcap-dev libgstreamer-plugins-base1.0-0 -y
+    - name: Install FPM
+      run: sudo gem install --no-document fpm
+    - name: Install Qt
+      uses: jurplel/[email protected]
+      with:
+        version: '5.15.2'
+    - name: Create Makefile
+      run:
+        qmake sACNView.pro
+    - name: Run MakeFile
+      run: make
+    - name: Setup TMate Session (Failure Only)
+      if: ${{ failure() }}
+      uses: mxschmitt/action-tmate@v3
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: linux
+        path: sACNView*.AppImage
+
+  build_windows:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: Install Qt
+      uses: jurplel/[email protected]
+      with:
+        version: '5.15.2'
+        arch: win32_msvc2019
+    - name: MSVC Environment Setup
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: amd64_x86
+    - name: Download NSIS SimpleFC Plugin
+      uses: suisei-cn/actions-download-file@v1
+      with:
+        url: "https://nsis.sourceforge.io/mediawiki/images/e/e0/NSIS_Simple_Firewall_Plugin_Unicode_1.21.zip"
+    - name: Install NSIS SimpleFC Plugin
+      run:  7z e NSIS_Simple_Firewall_Plugin_Unicode_1.21.zip -o"C:\Program Files (x86)\NSIS\Plugins\x86-unicode"
+    - name: Create Makefile
+      run: qmake sACNView.pro
+    - name: Run MakeFile
+      run: nmake
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: windows
+        path: install\win\sACNView*.exe 
+    - name: Setup TMate Session (Failure Only)
+      if: ${{ failure() }}
+      uses: mxschmitt/action-tmate@v3
+
+
+  build_mac:
+    runs-on: macos-latest
+
+    steps:    
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: Install Qt
+      uses: jurplel/[email protected]
+    - name: Install create-dmg
+      run: brew install create-dmg
+    - name: Create Makefile
+      run: qmake sACNView.pro
+    - name: Run MakeFile
+      run: make
+    - name: Setup TMate Session (Failure Only)
+      if: ${{ failure() }}
+      uses: mxschmitt/action-tmate@v3
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: macos
+        path: install/mac/sACNView*.dmg 

README.md

@@ -1,4 +1,4 @@
-# sACNView [![Build Status](https://travis-ci.org/docsteer/sacnview.svg?branch=2.1-dev)](https://travis-ci.org/docsteer/sacnview) [![Build status](https://ci.appveyor.com/api/projects/status/p8hmic8x2s6051o0?svg=true)](https://ci.appveyor.com/project/docsteer/sacnview)
+# sACNView ![Build Status](https://github.com/docsteer/sacnview/actions/workflows/build.yml/badge.svg)
 
 sACNView is a tool for viewing, monitoring and testing the ANSI/ESTA E1.17 protcol, informally known as "Streaming ACN".
 

deploy.pri

@@ -33,8 +33,8 @@ win32 {
         }
     }
 
-    DEPLOY_COMMAND = windeployqt
-    DEPLOY_OPT = --dir $${DEPLOY_DIR}
+    DEPLOY_COMMAND = $$shell_quote($$system_path($$(Qt5_DIR)/bin/windeployqt))
+    DEPLOY_OPT = --no-angle --no-opengl-sw --dir $${DEPLOY_DIR}
 
     DEPLOY_INSTALLER = makensis /DPRODUCT_VERSION="$${PRODUCT_VERSION}" /DTARGET_WINXP="$${TARGET_WINXP}" $$shell_quote($$system_path($${_PRO_FILE_PWD_}/install/win/install.nsi))
 }
@@ -46,7 +46,8 @@ macx {
 
     DEPLOY_COMMAND = macdeployqt
 
-    DEPLOY_CLEANUP = codesign --force --deep --verify --verbose --sign \"Thomas Steer\" $${DEPLOY_TARGET} $$escape_expand(\\n\\t)
+    # Skip while working on github runner
+    # DEPLOY_CLEANUP = codesign --force --deep --verify --verbose --sign \"Thomas Steer\" $${DEPLOY_TARGET} $$escape_expand(\\n\\t)
     DEPLOY_CLEANUP += $${QMAKE_DEL_FILE} $${DEPLOY_DIR}/sACNView*.dmg
 
     DEPLOY_INSTALLER = create-dmg --volname "sACNView_Installer" --volicon "$${_PRO_FILE_PWD_}/res/icon.icns"

install/win/install.nsi

@@ -43,7 +43,7 @@ SetCompressor /SOLID lzma
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 
 ; MSVC RunTime
-!define MSVC_EXE "vcredist_x86.exe"
+!define MSVC_EXE "vc_redist.x86.exe"
 !define MSVC_OPT "/install /passive /norestart" 
 
 Name "${PRODUCT_NAME}"

libs.pri

@@ -14,9 +14,10 @@ linux {
     system(rm $$shell_quote($${BREAKPAD_PATH_TEMP}))
 
     # Build
-    system(cd $${BREAKPAD_PATH} && ./configure && make)
+    system(cd $${BREAKPAD_PATH} && ./configure && make && sudo make install)
 
-    LIBS += -L$${BREAKPAD_PATH}/src/client/linux -lbreakpad_client
+    LIBS += -L$${BREAKPAD_PATH}/src/src/client/linux -lbreakpad_client
+    INCLUDEPATH  += {BREAKPAD_PATH}/src/src/
 
     HEADERS += src/crash_handler.h \
         src/crash_test.h