Merge branch 'master' into reparameterizeBSplines

DLR-SC · Jun 19, 2024 · 1e42819 · 1e42819
2 parents 4205385 + dfa7ca1
commit 1e42819
Show file tree

Hide file tree

Showing 26 changed files with 219 additions and 193 deletions.
diff --git a/.github/actions/build-linux/action.yml b/.github/actions/build-linux/action.yml
@@ -40,7 +40,7 @@ runs:
   steps:
 
     - name: Install dependencies
-      uses: nick-invision/retry@v2
+      uses: nick-fields/retry@v3
       with:
         timeout_minutes: 10
         max_attempts: 3
@@ -50,7 +50,7 @@ runs:
           echo "/usr/lib/ccache" >> $GITHUB_PATH
 
     - name: Setup miniconda
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
         auto-update-conda: true
         activate-environment: tigl-bld
@@ -92,7 +92,7 @@ runs:
         tar -czf build.tar.gz build
 
     - name: Upload build directory
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.build-artifact }}
         path: build.tar.gz

diff --git a/.github/actions/build-macos/action.yml b/.github/actions/build-macos/action.yml
@@ -45,7 +45,7 @@ runs:
   steps:
 
     - name: Install dependencies
-      uses: nick-invision/retry@v2
+      uses: nick-fields/retry@v3
       with:
         timeout_minutes: 10
         max_attempts: 3
@@ -56,7 +56,7 @@ runs:
           echo "CXXFLAGS=-fvisibility-inlines-hidden" >> $GITHUB_ENV
           
     - name: Setup miniconda
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
         auto-update-conda: true
         activate-environment: tigl-bld
@@ -103,7 +103,7 @@ runs:
 
     - name: Upload package as artifact
       if: ${{ inputs.package-artifact }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
        name: ${{ inputs.package-artifact }}
        path: build/*.dmg
@@ -114,7 +114,7 @@ runs:
         gtar -czf build.tar.gz build
 
     - name: Upload build directory
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.build-artifact }}
         path: build.tar.gz

diff --git a/.github/actions/build-win/action.yml b/.github/actions/build-win/action.yml
@@ -60,7 +60,7 @@ runs:
   steps:
 
     - name: Setup miniconda
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
         auto-update-conda: true
         activate-environment: tigl-bld
@@ -114,14 +114,14 @@ runs:
 
     - name: Upload package as artifact
       if: ${{ inputs.package-artifact }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.package-artifact }}
         path: build/*.zip
 
     - name: Upload installer as artifact
       if: ${{ inputs.installer-artifact }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
        name: ${{ inputs.installer-artifact }}
        path: build/*.exe
@@ -135,7 +135,7 @@ runs:
 
     - name: Upload documentation as artifact
       if: ${{ inputs.documentation-artifact }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
        name: ${{ inputs.documentation-artifact }}
        path: build/doc/html/*
@@ -146,7 +146,7 @@ runs:
         tar -czf build.tar.gz build
 
     - name: Upload build directory
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.build-artifact }}
         path: build.tar.gz

diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
@@ -13,7 +13,7 @@ runs:
 
   steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Split Release Description from Changelog
       shell: bash -l {0}
@@ -38,22 +38,22 @@ runs:
          github_ref: ${{ github.ref }}
 
     - name: download Win64 package Build artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: win-package
 
     - name: download Win64 installer Build artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: win-installer
 
     - name: download MacOS package Build artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: macos-package
 
     - name: download html-documentation
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: html-documentation
         path: html-documentation
@@ -74,7 +74,7 @@ runs:
           macos-package/TIGL-${{ env.version }}-Darwin.dmg
 
     - name: Checkout tigl-website repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: DLR-SC/tigl-website
         path: tigl-website
@@ -111,7 +111,7 @@ runs:
         token: ${{ inputs.GH_TOKEN }}
 
     - name: Checkout tigl-conda repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: DLR-SC/tigl-conda
         path: tigl-conda

diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml
@@ -13,6 +13,10 @@ inputs:
     required: false
     default: false
 
+  codecov_token:
+    description: 'CodeCov token needed to publish coverage report on codecov'
+    required: true
+
   unit-tests:
     description: "Set to true to run TiGLs unit tests (true or false)"
     required: false
@@ -36,15 +40,15 @@ runs:
         sudo apt-get install -y lcov
         
     - name: Setup miniconda
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
         auto-update-conda: true
         activate-environment: tigl-bld
         environment-file: environment.yml
         auto-activate-base: false
 
     - name: Download build directory
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ${{ inputs.build-artifact }}
 
@@ -77,6 +81,12 @@ runs:
 
     - name: Publish coverage report to codecov.io (ubuntu debug)
       if: ${{ inputs.coverage == 'true' }}
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         files: ./build/tests/unittests/coverageReport-unit.info,./build/tests/integrationtests/coverageReport-integration.info
+        token: ${{ inputs.codecov_token }}
+        codecov_yml_path: codecov.yml
+        disable_search: true
+        verbose: true
+        flags: unittests
+
diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml
@@ -25,15 +25,15 @@ runs:
   steps:
 
     - name: Setup miniconda
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
         auto-update-conda: true
         activate-environment: tigl-bld
         environment-file: environment.yml
         auto-activate-base: false
 
     - name: Download built test directory
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ${{ inputs.build-artifact }}
 

diff --git a/.github/actions/test-win/action.yml b/.github/actions/test-win/action.yml
@@ -25,7 +25,7 @@ runs:
   steps:
 
     - name: Download built test directory
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: ${{ inputs.build-artifact }}
 

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -8,6 +8,9 @@ on:
       GH_TOKEN:
         description: 'A Github PAT'
         required: true
+      CODECOV_TOKEN:
+        description: 'Needed to upload coverage report to codecov'
+        required: true
 
     inputs:
 
@@ -67,15 +70,15 @@ jobs:
     strategy:
       matrix:
         config: ["Debug", "Release"]
-        os: ["ubuntu-latest", "ubuntu-20.04"]
+        os: ["ubuntu-latest", "ubuntu-22.04"]
         # only enable coverage for Debug build on latest ubuntu
         include:
           - config: "Debug"
             os: "ubuntu-latest"
             coverage: "ON"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/build-linux
         with:
           config: ${{ matrix.config }}
@@ -90,7 +93,7 @@ jobs:
     strategy:
       matrix:
         config: ["Debug", "Release"]
-        os: ["ubuntu-latest", "ubuntu-20.04"]
+        os: ["ubuntu-latest", "ubuntu-22.04"]
         unit-tests: [true]
         # generate coverage reports on latest ubuntu debug builds
         exclude:
@@ -103,13 +106,14 @@ jobs:
             unit-tests: false
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/test-linux
         with:
           build-artifact: build-${{ matrix.os }}-${{ matrix.config }}-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-${{ matrix.coverage || 'OFF' }}
           coverage: ${{ matrix.coverage == 'ON' || false }}
           unit-tests: ${{ matrix.unit-tests }}
           integration-tests: ${{ inputs.integration-tests == 'true' || false }}
+          codecov_token: ${{ secrets.CODECOV_TOKEN }}
 
 
   build-windows:
@@ -127,7 +131,7 @@ jobs:
            installer-artifact: ${{ inputs.win-installer-artifact }}
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/build-win
         with:
           config: ${{ matrix.config }}
@@ -154,34 +158,34 @@ jobs:
            tigl_bindings_python_internal: "ON"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/test-win
         with:
           build-artifact: build-${{ matrix.os }}-${{ matrix.config }}-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-OFF-static-${{ matrix.oce_static_libs || 'OFF' }}-python-${{ matrix.tigl_bindings_python_internal || 'OFF' }}
           unit-tests: true
           integration-tests: ${{ inputs.integration-tests == 'true' }}
 
   build-macos:
-    runs-on: "macos-latest"
+    runs-on: "macos-13"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/build-macos
         with:
           config: "Release"
           tigl_nightly: ${{ inputs.tigl_nightly =='true' }}
           tigl_concat_generated_files: ${{ inputs.tigl_concat_generated_files == 'true' }}
           tigl_enable_coverage: 'OFF'
           package-artifact: ${{ inputs.macos-package-artifact }}
-          build-artifact: build-macos-latest-Release-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-OFF-static-ON-python-OFF
+          build-artifact: build-macos-13-Release-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-OFF-static-ON-python-OFF
 
   test-macos:
     needs: build-macos
-    runs-on: "macos-latest"
+    runs-on: "macos-13"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/test-macos
         with:
-          build-artifact: build-macos-latest-Release-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-OFF-static-ON-python-OFF
+          build-artifact: build-macos-13-Release-nightly-${{ inputs.tigl_nightly }}-concat-${{ inputs.tigl_concat_generated_files }}-cov-OFF-static-ON-python-OFF
           unit-tests: true
           integration-tests: ${{ inputs.integration-tests == 'true' }}
 
@@ -190,7 +194,7 @@ jobs:
     needs: ["test-macos", "test-windows", "test-linux"]
     runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/release
         with:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/TIGLViewer/src/TIGLViewerDocument.cpp b/TIGLViewer/src/TIGLViewerDocument.cpp
@@ -2365,7 +2365,7 @@ void TIGLViewerDocument::showRotorProperties()
 
         tmpPoint = rotor.GetTranslation();
         ADD_PROPERTY_TEXT("Translation", "(" + QString::number(tmpPoint.x) + "; " + QString::number(tmpPoint.y) + "; " + QString::number(tmpPoint.z) + ")")
-        ADD_PROPERTY_TEXT("RPM", QString::number(rotor.GetNominalRotationsPerMinute().get_value_or(0)));
+        ADD_PROPERTY_TEXT("RPM", QString::number(rotor.GetNominalRotationsPerMinute()));
         ADD_PROPERTY_TEXT("Tip Speed", QString::number(rotor.GetTipSpeed()));
         ADD_PROPERTY_TEXT("RotorBladeAttachmentCount", QString::number(rotor.GetRotorBladeAttachmentCount()));
         ADD_PROPERTY_TEXT("RotorBladeCount", QString::number(rotor.GetRotorBladeCount()));

diff --git a/bindings/java/build.gradle.in b/bindings/java/build.gradle.in
@@ -20,11 +20,11 @@ repositories {
 	mavenCentral()
 }
 dependencies {
-	compile group: 'commons-logging', name: 'commons-logging', version: '1.2'
-	compile group: 'net.java.dev.jna', name: 'jna', version: '4.1.0'
+        implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
+        implementation group: 'net.java.dev.jna', name: 'jna', version: '4.1.0'
 }
 
 
 task prepareWrapper(type: Wrapper) {
    gradleVersion = '2.1'
-}
+}
diff --git a/bindings/java/gradle/wrapper/gradle-wrapper.jar b/bindings/java/gradle/wrapper/gradle-wrapper.jar
diff --git a/bindings/java/gradle/wrapper/gradle-wrapper.properties b/bindings/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Oct 24 09:18:09 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip