Merge branch 'master' of https://github.com/NeutrinoToolkit/Neutrino

.cirrus.yml

@@ -20,7 +20,7 @@ debian_task:
   script: |
     export DEBIAN_FRONTEND=noninteractive
     apt-get update -qq
-    apt-get install -yy git file pandoc cmake libxkbcommon-dev libgl1-mesa-dev libvulkan* libnetpbm10-dev libhdf5-dev libfftw3-dev libhdf4-dev  g++ build-essential libtiff5-dev libgsl-dev lsb-release libcfitsio-dev libhdf4-dev libhdf5-dev libhdf5-103-1 libxcb-xkb-dev qt6-tools-dev qt6-multimedia-dev qt6-declarative-dev qt6-charts-dev qt6-svg-dev
+    apt-get install -yy git file pandoc cmake libxkbcommon-dev libgl1-mesa-dev libvulkan* libnetpbm11-dev libhdf5-dev libfftw3-dev libhdf4-dev  g++ build-essential libtiff5-dev libgsl-dev lsb-release libcfitsio-dev libhdf4-dev libhdf5-dev libhdf5-103-1 libxcb-xkb-dev qt6-tools-dev qt6-multimedia-dev qt6-declarative-dev qt6-charts-dev qt6-svg-dev
     apt-get install -yy qml6-module*
     mkdir build && cd build
     cmake ..
@@ -84,17 +84,17 @@ macM1_task:
     brew install libomp git cmake fftw gcc qt lcov pkg-config zlib cmake libtiff cfitsio gsl pandoc vulkan-headers hdf5
     brew install iltommi/brews/hdf4
     brew install iltommi/brews/clfft
-    git clone https://github.com/iltommi/pythonqt.git
-    cd pythonqt
-    cd generator
-    qmake -r generator.pro
-    make -j10
-    QTDIR=$(brew --prefix qt) ./pythonqt_generator
-    cd ..
-    QTDIR=$(brew --prefix qt) qmake -r
-    make -j10
-    INSTALL_ROOT=$(brew --prefix) make install
-    cd ..
+    # git clone https://github.com/iltommi/pythonqt.git
+    # cd pythonqt
+    # cd generator
+    # qmake -r generator.pro
+    # make -j10
+    # QTDIR=$(brew --prefix qt) ./pythonqt_generator
+    # cd ..
+    # QTDIR=$(brew --prefix qt) qmake -r
+    # make -j10
+    # INSTALL_ROOT=$(brew --prefix) make install
+    # cd ..
     mkdir -p build && cd build
     cmake ..
     make -j$(sysctl -n hw.ncpu) install

.github/workflows/main.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: macos-12
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Tag latest
@@ -42,7 +42,7 @@ jobs:
         make -j$(sysctl -n hw.ncpu) install
         ../resources/macPackage/prepareapp.sh
     - name: Archive
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Neutrino.zip
         path: "build/Neutrino*.zip"