Merge pull request #2233 from SCIInstitute/more-github-builds

Bunch of small stuff

Author: dcwhite

.github/workflows/ccpp.yml

@@ -31,6 +31,28 @@ jobs:
       run: |
         cat ./SCIRun | head -c 1024
 
+  linux-build-gui-nonpython:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-16.04, ubuntu-18.04, ubuntu-latest]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Prepare
+      run: sudo apt-get update && sudo apt-get install mesa-common-dev libgl1-mesa-dev mesa-utils-extra libglapi-mesa ninja-build qt5-qmake qtbase5-dev libqt5opengl5-dev libqt5svg5-dev
+
+    - name: Build
+      run: ./build.sh -DQt5_PATH=$(dpkg -L qtbase5-dev) -DBUILD_WITH_PYTHON=OFF -DUSER_PYTHON_VERSION="3.8.2" -j3
+
+    - name: Basic Test
+      working-directory: bin/SCIRun
+      run: |
+        cat ./SCIRun | head -c 1024
+
   linux-build-headless:
 
     runs-on: ${{ matrix.os }}

.github/workflows/mac.yml

@@ -63,6 +63,48 @@ jobs:
     #     files: |
     #          bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
 
+  mac-build-gui-nonpython:
+
+    runs-on: macOS-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Install Qt
+      uses: jurplel/[email protected]
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+      with:
+        version: 5.14.2
+        target: desktop
+        host: mac
+        install-deps: true
+
+    - name: Prepare
+      run: |
+        ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/Tk.framework/Versions/8.5/Headers/X11/ /usr/local/include/X11
+
+    - name: make
+      run: ./build.sh -DBUILD_WITH_PYTHON=OFF -DQt5_PATH="${Qt5_Dir}"
+
+    - name: Package
+      working-directory: bin/SCIRun
+      run: |
+        cmake -DBUILD_BUNDLE:BOOL=ON ../../src
+        make -j3
+        make package
+        chmod +x repair_package.sh
+        ./repair_package.sh
+
+    - name: Upload installer
+      uses: actions/upload-artifact@v2
+      with:
+        name: SCIRunMacNPInstaller
+        path: bin/SCIRun/SCIRun-5.0.beta.*-Darwin.pkg
+
   mac-build-gui-ospray:
 
     runs-on: macOS-latest

Superbuild/EigenExternal.cmake

@@ -28,7 +28,7 @@ SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
 
 # TODO: test on Windows
 ExternalProject_Add(Eigen_external
-  URL "https://github.com/eigenteam/eigen-git-mirror/archive/3.3.7.tar.gz"
+  URL "https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.gz"
   PATCH_COMMAND ""
   CONFIGURE_COMMAND ""
   BUILD_IN_SOURCE ON