Merge 80c3852 into 93b69b0

OpenHeartDevelopers · Apr 17, 2024 · 466344b · 466344b
2 parents 93b69b0 + 80c3852
commit 466344b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -19,7 +19,7 @@ jobs:
         sudo aqt install --outputdir /Qt 5.12.10 linux desktop -m qtcharts qtnetworkauth qtpurchasing qtdatavis3d qtscript qtvirtualkeyboard qtwebengine qtwebglplugin
 
     - name: Clone CemrgApp
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Code Analysis
       env:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,9 +24,10 @@ jobs:
     needs: [Variables, Build-Linux, Build-macOS]
     steps:
     - name: Download packages
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
-        name: Packages
+        pattern: Packages-*
+        merge-multiple: true
 
     - name: Upload Linux package
       uses: actions/[email protected]
@@ -80,7 +81,7 @@ jobs:
     - name: Install missing packages
       run: |
         sudo apt update
-        sudo DEBIAN_FRONTEND=noninteractive apt install libxt-dev libtiff5-dev libfontconfig1 mesa-common-dev libglu1-mesa-dev libxcomposite1 libxcursor1 libxrender1 libxi6 libxtst6 libasound2 libnspr4 libnss3 libxkbcommon-dev libxkbcommon-x11-dev doxygen git cmake python3-pip gcc-6 g++-6 -y
+        sudo DEBIAN_FRONTEND=noninteractive apt install libxt-dev libtiff5-dev libfontconfig1 mesa-common-dev libglu1-mesa-dev libxcomposite1 libxcursor1 libxrender1 libxi6 libxtst6 libasound2 libnspr4 libnss3 libxkbcommon-dev libxkbcommon-x11-dev doxygen git cmake python3-pip gcc g++ -y
         sudo apt remove --auto-remove icu-devtools libicu-dev -y
 
     - name: Install Qt
@@ -96,7 +97,7 @@ jobs:
       run: sudo find /MITK/ -exec touch -a -m -d 20210401 {} \;
 
     - name: Clone CemrgApp
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: CemrgApp
 
@@ -128,9 +129,9 @@ jobs:
         mv CemrgApp-Linux.zip ${{ github.workspace }}/
 
     - name: Upload package
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: Packages
+        name: Packages-Linux
         path: CemrgApp-Linux.zip
 
 
@@ -170,7 +171,7 @@ jobs:
   #     run: dir -R c:\MITK | foreach { $_.LastWriteTime = [DateTime]::ParseExact('01-04-21', 'dd-MM-yy', $null) }
   #
   #   - name: Clone CemrgApp
-  #     uses: actions/checkout@v2
+  #     uses: actions/checkout@v4
   #     with:
   #       path: CemrgApp
   #
@@ -209,9 +210,9 @@ jobs:
   #       move CemrgApp-Windows.zip ${{ github.workspace }}\
   #
   #   - name: Upload package
-  #     uses: actions/upload-artifact@v2
+  #     uses: actions/upload-artifact@v4
   #     with:
-  #       name: Packages
+  #       name: Packages-Windows
   #       path: CemrgApp-Windows.zip
 
 
@@ -263,7 +264,7 @@ jobs:
       run: find /Users/Shared/MITK/ -exec touch -a -m -t 202104010000 {} \;
 
     - name: Clone CemrgApp
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: CemrgApp
 
@@ -313,7 +314,7 @@ jobs:
         hdiutil create -volname CemrgApp -srcfolder /Users/Shared/CemrgApp-macOS -ov -format UDZO ${{ github.workspace }}/CemrgApp-macOS.dmg
 
     - name: Upload package
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: Packages
+        name: Packages-macOS
         path: CemrgApp-macOS.dmg
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Install missing packages
       run: |
         sudo apt update
-        sudo DEBIAN_FRONTEND=noninteractive apt install libxt-dev libtiff5-dev libfontconfig1 mesa-common-dev libglu1-mesa-dev libxcomposite1 libxcursor1 libxrender1 libxi6 libxtst6 libasound2 libnspr4 libnss3 libxkbcommon-dev libxkbcommon-x11-dev libtbb2 doxygen git cmake python3-pip gcc-6 g++-6 -y
+        sudo DEBIAN_FRONTEND=noninteractive apt install libxt-dev libtiff5-dev libfontconfig1 mesa-common-dev libglu1-mesa-dev libxcomposite1 libxcursor1 libxrender1 libxi6 libxtst6 libasound2 libnspr4 libnss3 libxkbcommon-dev libxkbcommon-x11-dev libtbb2 doxygen git cmake python3-pip gcc g++ -y
         sudo apt remove --auto-remove icu-devtools libicu-dev -y
     
     - name: Install Qt
@@ -42,7 +42,7 @@ jobs:
       run: sudo find /MITK/ -exec touch -a -m -d 20210401 {} \;
 
     - name: Clone CemrgApp
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: CemrgApp
 
@@ -52,8 +52,8 @@ jobs:
     - name: Build
       working-directory: /Build
       env:
-        CC: gcc-6
-        CXX: g++-6
+        CC: gcc
+        CXX: g++
       run: make -j4
 
     - name: Test
@@ -64,10 +64,9 @@ jobs:
       run: ctest -R Cemrg -V
 
     - name: Code Coverage
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        functionalities: coveragepy
         root_dir: /CemrgApp/
-        gcov_root_dir: /Build/MITK-build
         directory: ${{ github.workspace }}
+        plugin: gcov