Remove linux build

Author: arm61

.github/workflows/build.yml

@@ -16,21 +16,12 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-11]
+        os: [windows-2019, macos-11]
 
     steps:
-      - name: Check-out repository
+      - name: Check-out EasyReflectometry repository
         uses: actions/checkout@v3
 
-      - name: Set up non-Python dependences (Linux)
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get -o Acquire::Retries=3 update
-          sudo apt-get -o Acquire::Retries=3 install libxcb-xinerama0
-          sudo apt-get -o Acquire::Retries=3 install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xfixes0
-          sudo apt-get -o Acquire::Retries=3 install libxcb-shape0
-          sudo apt-get -o Acquire::Retries=3 install libpulse-mainloop-glib0
-
       - name: Setup Python
         uses: actions/setup-python@v4.5.0
         with:
@@ -39,9 +30,13 @@ jobs:
       - name: Upgrade PIP
         run: python -m pip install --upgrade pip
 
-      - name: Install with dependencies
+      - name: Create and activate venv
         run: |
-          pip install '.[ci]'
+          python -m venv env
+          source env/bin/activate
+
+      - name: Install with EasyReflectometry dependencies
+        run: pip install '.[ci]'
 
       - name: Declare env variables on push only
         if: github.event_name == 'push'
@@ -86,10 +81,10 @@ jobs:
       - name: Create freezed python app bundle
         run: python ${{ env.SCRIPTS_PATH }}/FreezeApp.py
 
-      - name: Create offline app installers from freezed app bundle
+      - name: Create offline app installers
         run: python ${{ env.SCRIPTS_PATH }}/MakeInstaller.py ${{ secrets.BINARY_SIGN_WIN }} ${{ secrets.CERT_ZIP_PASS }}
 
-      - name: Create online app installers from freezed app bundle
+      - name: Create online app installers
         if: github.event_name == 'push' && env.BRANCH_NAME == 'master'
         run: python ${{ env.SCRIPTS_PATH }}/MakeOnlineInstaller.py ${{ secrets.BINARY_SIGN_WIN }} ${{ secrets.CERT_ZIP_PASS }}
 
@@ -102,41 +97,31 @@ jobs:
           "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1920 1080
           system_profiler SPDisplaysDataType | grep Resolution
 
-      - name: Set up screen recording dependencies (Linux)
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get install libxkbcommon-x11-0
-          Xvfb :0 -screen 0 1920x1080x24 -ac &
-          echo "DISPLAY=:0" >> $GITHUB_ENV
-
       - name: Set up screen recording dependencies (Windows)
         if: runner.os == 'Windows'
         run: |
           Set-DisplayResolution -Width 1920 -Height 1080 -Force
           Get-DisplayResolution
 
-      - name: Make dir for .desktop file (Linux)
-        if: runner.os == 'Linux'
-        run: mkdir -p ~/.local/share/applications/
-
       - name: Install app
         run: python ${{ env.SCRIPTS_PATH }}/InstallApp.py
 
-      - name: Run app in testmode, record screen and quit
+      - name: Run app in testmode and quit
         run: python ${{ env.SCRIPTS_PATH }}/RunApp.py --testmode
 
-      # #- name: Rename test videos
-      # #  run: poetry run python ${{ env.SCRIPTS_PATH }}/CreateTestVideos.py ${{ env.BRANCH_NAME }}
-
       - name: Create zip archive of offline app installer
         run: python ${{ env.SCRIPTS_PATH }}/ZipArtifacts.py ${{ env.BRANCH_NAME }}
 
-      - uses: actions/upload-artifact@v3
+      - name: Upload installer to artifacts
+        uses: actions/upload-artifact@v3
+        if: runner.os == 'macOS'
         with:
           name: macOS
           path: "${{ env.DISTRIBUTION_PATH }}/${{ env.APP_NAME }}_macOS_*.zip"
 
-      - uses: actions/upload-artifact@v3
+      - name: Upload installer to artifacts
+        uses: actions/upload-artifact@v3
+        if: runner.os == 'Windows'
         with:
           name: windows
           path: "${{ env.DISTRIBUTION_PATH }}/${{ env.APP_NAME }}_Windows_*.zip"

EasyReflectometryApp/main.py

@@ -17,7 +17,7 @@
 import EasyReflectometryApp
 import toml
 import easyApp
-from easyApp.Logic.Maintenance import Updater
+# from easyApp.Logic.Maintenance import Updater
 # from easyApp.Logic.Translate import Translator
 from EasyReflectometryApp.Logic.PyQmlProxy import PyQmlProxy
 
@@ -95,7 +95,7 @@ def main():
     engine.rootContext().setContextProperty('_isSystemThemeDark', isDark)
 
     # Register types to be instantiated in QML
-    qmlRegisterType(Updater, 'easyApp.Logic.Maintenance', 1, 0, 'Updater')
+    # qmlRegisterType(Updater, 'easyApp.Logic.Maintenance', 1, 0, 'Updater')
 
     # Add paths to search for installed modules
     engine.addImportPath(easyApp_path)

LICENSE.md

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2021-2022, European Spallation Source
+Copyright (c) 2021-2023, European Spallation Source
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without