Merge branch 'dev' into meshsdk

Author: alpinebuster

.github/actions/collect-artifact-stats/action.yml

@@ -4,6 +4,9 @@ inputs:
   artifact_path:
     required: true
     type: string
+  artifact_glob:
+    required: true
+    type: string
   stats_file_suffix:
     required: false
     type: string
@@ -19,8 +22,8 @@ runs:
       shell: python3 collect_artifact_stats.py {0}
       working-directory: ${{ github.action_path }}/../../../scripts/devops
       env:
-        ARTIFACT_PATH: ../..
-        ARTIFACT_GLOB: ${{ inputs.artifact_path }}
+        ARTIFACT_PATH: ${{ inputs.artifact_path }}
+        ARTIFACT_GLOB: ${{ inputs.artifact_glob }}
         STATS_FILE: "${{ runner.temp }}/ArtifactStats${{ inputs.stats_file_suffix }}.json"
       run: ""
 

.github/workflows/build-test-distribute.yml

@@ -67,7 +67,7 @@ jobs:
       internal_build:        ${{ needs.config.outputs.internal_build == 'true' }}
       upload_artifacts:      ${{ needs.config.outputs.upload_artifacts == 'true' || needs.config.outputs.tag-build-release-windows == 'true' }}
       upload_test_artifacts: ${{ needs.config.outputs.upload_test_artifacts == 'true' }}
-      nuget_build:           ${{ needs.config.outputs.build_enable_ubuntu_x64 == 'true' && needs.config.outputs.upload_artifacts == 'true' }}
+      nuget_build:           ${{ needs.config.outputs.build_enable_linux_vcpkg == 'true' && needs.config.outputs.upload_artifacts == 'true' }}
     secrets: inherit
 
   ubuntu-arm64-build-test:
@@ -95,7 +95,6 @@ jobs:
       internal_build:        ${{ needs.config.outputs.internal_build == 'true' }}
       upload_artifacts:      ${{ needs.config.outputs.upload_artifacts == 'true' }}
       upload_test_artifacts: ${{ needs.config.outputs.upload_test_artifacts == 'true' }}
-      nuget_build_patch:     ${{ needs.config.outputs.build_enable_windows == 'true' && needs.config.outputs.upload_artifacts == 'true'}}
     secrets: inherit
 
   linux-vcpkg-build-test:
@@ -109,6 +108,7 @@ jobs:
       internal_build:        ${{ needs.config.outputs.internal_build == 'true' }}
       upload_artifacts:      ${{ needs.config.outputs.upload_artifacts == 'true' }}
       upload_test_artifacts: ${{ needs.config.outputs.upload_test_artifacts == 'true' }}
+      nuget_build_patch:     ${{ needs.config.outputs.build_enable_windows == 'true' && needs.config.outputs.upload_artifacts == 'true'}}
     secrets: inherit
 
   emscripten-build-test:
@@ -144,16 +144,16 @@ jobs:
     secrets: inherit
 
   create-nuget-package:
-    if: ${{ needs.config.outputs.upload_artifacts == 'true' && needs.config.outputs.build_enable_windows == 'true' && needs.config.outputs.build_enable_ubuntu_x64 == 'true'}}
+    if: ${{ needs.config.outputs.upload_artifacts == 'true' && needs.config.outputs.build_enable_windows == 'true' && needs.config.outputs.build_enable_linux_vcpkg == 'true' }}
     needs:
       - config
       - windows-build-test
-      - ubuntu-x64-build-test
+      - linux-vcpkg-build-test
     timeout-minutes: 20
-    runs-on: windows-2022
+    runs-on: windows-2025
     steps:
      - name: Checkout
-       uses: actions/checkout@v5
+       uses: actions/checkout@v6
 
      - name: Download NuGet Windows Patch Archive
        uses: actions/download-artifact@v6
@@ -210,7 +210,7 @@ jobs:
       - macos-build-test
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Download All Developer Distributives
         uses: actions/download-artifact@v6
@@ -258,7 +258,11 @@ jobs:
     needs: [ config, upload-distributions ]
     uses: ./.github/workflows/test-distribution.yml
     with:
-      release_tag: ${{ needs.config.outputs.release_tag }}
+      release_tag:       ${{ needs.config.outputs.release_tag }}
+      test_ubuntu_x64:   ${{ needs.config.outputs.build_enable_ubuntu_x64 == 'true' }}
+      test_ubuntu_arm64: ${{ needs.config.outputs.build_enable_ubuntu_arm64 == 'true' }}
+      test_macos:        ${{ needs.config.outputs.build_enable_macos == 'true' }}
+      test_windows:      ${{ needs.config.outputs.build_enable_windows == 'true' && needs.config.outputs.build-release-win == 'true' }}
     secrets:
       GH_TOKEN: ${{ secrets.BUILD_MACHINE_TOKEN }}
 
@@ -277,7 +281,7 @@ jobs:
     continue-on-error: true
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Download runners' system stats
         uses: actions/download-artifact@v6

.github/workflows/build-test-emscripten.yml

@@ -52,7 +52,7 @@ jobs:
           fi
 
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get AWS instance type
         uses: ./.github/actions/get-aws-instance-type
@@ -79,8 +79,9 @@ jobs:
 
       - name: Install thirdparty libs
         run: |
-          ln -s /usr/local/lib/${{ matrix.thirdparty-dir }}/lib ./lib
           ln -s /usr/local/lib/${{ matrix.thirdparty-dir }}/include ./include
+          ln -s /usr/local/lib/${{ matrix.thirdparty-dir }}/lib ./lib
+          ln -s /usr/local/lib/${{ matrix.thirdparty-dir }}/share ./share
 
       - name: Build
         env:
@@ -141,5 +142,6 @@ jobs:
         continue-on-error: true
         uses: ./.github/actions/collect-artifact-stats
         with:
-          artifact_path: meshsdk_${{ matrix.package_name }}.zip
+          artifact_path: ${{ github.workspace }}
+          artifact_glob: meshsdk_${{ matrix.package_name }}.zip
           stats_file_suffix: -${{ steps.collect-runner-stats.outputs.job_id }}

.github/workflows/build-test-linux-vcpkg.yml

@@ -30,6 +30,10 @@ on:
         default: true
         required: false
         type: boolean
+      nuget_build_patch:
+        default: false
+        required: false
+        type: boolean
 
 jobs:
   linux-vcpkg-build-test:
@@ -68,9 +72,6 @@ jobs:
             os: ubuntu-latest
           - arch: arm64
             os: ubuntu-24.04-arm
-          - arch: arm64
-            compiler: GCC 11
-            skip_mrbind: true # GCC + ARM64 build has unresolved problems
     permissions:
       id-token: write # This is required for requesting the JWT
       contents: read  # This is required for actions/checkout
@@ -91,7 +92,7 @@ jobs:
           done
 
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get AWS instance type
         uses: ./.github/actions/get-aws-instance-type
@@ -117,7 +118,7 @@ jobs:
           git submodule update --init --recursive --depth 1 thirdparty/imgui thirdparty/mrbind-pybind11 thirdparty/mrbind
 
       - name: Install MRBind
-        if: ${{ (inputs.mrbind || inputs.mrbind_c) && !matrix.skip_mrbind }}
+        if: ${{ inputs.mrbind || inputs.mrbind_c }}
         run: scripts/mrbind/install_mrbind_rockylinux.sh
 
       - name: Create virtualenv
@@ -132,7 +133,7 @@ jobs:
         run: python3 -m pip install -r ./requirements/python.txt
 
       - name: Generate C bindings
-        if: ${{ inputs.mrbind_c && !matrix.skip_mrbind }}
+        if: ${{ inputs.mrbind_c }}
         env:
           CXX: ${{ matrix.cxx-compiler }}
         run: make -f scripts/mrbind/generate.mk -B --trace TARGET=c DEPS_BASE_DIR=/opt/vcpkg/installed/${{ matrix.arch }}-linux-meshsdk CXX_FOR_BINDINGS=/usr/bin/clang++
@@ -150,11 +151,12 @@ jobs:
             -DMR_CXX_STANDARD=${{ matrix.cxx-standard }}
             -DMR_PCH_USE_EXTRA_HEADERS=ON
             -DCMAKE_CUDA_HOST_COMPILER=/opt/rh/gcc-toolset-11/root/usr/bin/g++
-            -DMESHSDK_BUILD_GENERATED_C_BINDINGS=${{ fromJSON('["OFF", "ON"]')[inputs.mrbind_c && !matrix.skip_mrbind] }}
+            -DMESHSDK_BUILD_GENERATED_C_BINDINGS=${{ fromJSON('["OFF", "ON"]')[inputs.mrbind_c] }}
             -DMRVIEWER_NO_GTK=ON
+            -DMRVIEWER_WITH_BUNDLED_CURL=ON
 
       - name: Generate and build Python bindings
-        if: ${{ inputs.mrbind && !matrix.skip_mrbind }}
+        if: ${{ inputs.mrbind }}
         env:
           CXX: ${{ matrix.cxx-compiler }}
         run: make -f scripts/mrbind/generate.mk MODE=none -B --trace MESHSDK_SHLIB_DIR=build/${{matrix.config}}/bin CXX_FOR_BINDINGS=/usr/bin/clang++ DEPS_BASE_DIR=/opt/vcpkg/installed/${{ matrix.arch }}-linux-meshsdk
@@ -174,31 +176,30 @@ jobs:
         run: xvfb-run -a ./build/${{ matrix.config }}/bin/MeshViewer -hidden -noEventLoop -unloadPluginsAtEnd
 
       - name: Unit Tests
-        run: ./build/${{ matrix.config }}/bin/MRTest ${{ matrix.skip_mrbind && '--no-python-tests' || '' }}
+        run: ./build/${{ matrix.config }}/bin/MRTest
 
       - name: C Unit Tests (old bindings)
         run: ./build/${{ matrix.config }}/bin/MRTestC
 
       - name: C Unit Tests
-        if: ${{ inputs.mrbind_c && !matrix.skip_mrbind }}
+        if: ${{ inputs.mrbind_c }}
         run: ./build/${{ matrix.config }}/bin/MRTestC2
 
       - name: Python Sanity Tests
-        if: ${{ inputs.mrbind && !matrix.skip_mrbind }}
+        if: ${{ inputs.mrbind }}
         timeout-minutes: 8
         working-directory: ./build/${{ matrix.config }}/bin
         run: python3 ./../../../scripts/run_python_test_script.py -d '../test_python'
 
       - name: Python Regression Tests
-        if: ${{ inputs.internal_build && inputs.mrbind && !matrix.skip_mrbind }}
+        if: ${{ inputs.internal_build && inputs.mrbind }}
         uses: ./.github/actions/python-regression-tests
         with:
           build_config: ${{ matrix.config }}
-          mrbind: ${{ inputs.mrbind && !matrix.skip_mrbind }}
+          mrbind: ${{ inputs.mrbind }}
           pytest_args: "--run-cuda=negative"
           smoke: ${{ !inputs.full_config_build && matrix.config == 'Debug' }}
           test_artifacts_path: linux-vcpkg-${{ matrix.arch }}/${{ matrix.config }}/${{ matrix.compiler }}
-          ubuntu20_arm_workaround: ${{ inputs.mrbind && matrix.arch == 'arm64' }}
           upload_test_artifacts: ${{ inputs.upload_test_artifacts }}
 
       - name: Create Package
@@ -250,5 +251,23 @@ jobs:
         continue-on-error: true
         uses: ./.github/actions/collect-artifact-stats
         with:
-          artifact_path: meshsdk_linux-vcpkg-${{ matrix.arch }}.tar.xz
+          artifact_path: ${{ github.workspace }}
+          artifact_glob: meshsdk_linux-vcpkg-${{ matrix.arch }}.tar.xz
           stats_file_suffix: -${{ steps.collect-runner-stats.outputs.job_id }}
+
+      - name: Create and fix fake Wheel for NuGet
+        if: ${{ inputs.nuget_build_patch && matrix.arch == 'x64' && matrix.compiler == 'Clang 19' && matrix.config == 'Release' }}
+        shell: bash
+        run: |
+          python3 -m venv ./wheel_venv
+          source ./wheel_venv/bin/activate
+          python3 -m pip install auditwheel patchelf
+          python3 ./scripts/nuget_patch/patch_library_deps.py "./build/Release/bin/libMRMeshC.so" "./patched_content/"
+
+      - name: Upload NuGet files to Artifacts
+        if: ${{ inputs.nuget_build_patch && matrix.arch == 'x64' && matrix.compiler == 'Clang 19' && matrix.config == 'Release' }}
+        uses: actions/upload-artifact@v5
+        with:
+          name: DotNetPatchArchiveLinux-x64
+          path: ./patched_content/*
+          retention-days: 1

.github/workflows/build-test-macos.yml

@@ -68,7 +68,7 @@ jobs:
       contents: read  # This is required for actions/checkout
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           submodules: true
 
@@ -249,5 +249,6 @@ jobs:
         continue-on-error: true
         uses: ./.github/actions/collect-artifact-stats
         with:
-          artifact_path: meshsdk_${{matrix.os}}.pkg
+          artifact_path: ${{ github.workspace }}
+          artifact_glob: meshsdk_${{matrix.os}}.pkg
           stats_file_suffix: -${{ steps.collect-runner-stats.outputs.job_id }}

.github/workflows/build-test-ubuntu-arm64.yml

@@ -1,4 +1,4 @@
-name: Build and test on arm64 ubuntu20 and ubuntu22
+name: Build and test Ubuntu arm64
 
 on:
   workflow_call:
@@ -41,14 +41,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu20, ubuntu22, ubuntu24 ]
+        os: [ ubuntu22, ubuntu24 ]
         config: [ Release ]
         include:
-          - os: ubuntu20
-            compiler: clang
-            cxx-compiler: /usr/bin/clang++-11
-            c-compiler: /usr/bin/clang-11
-            cxx-standard: 20
           - os: ubuntu22
             compiler: clang
             cxx-compiler: /usr/bin/clang++-14
@@ -75,7 +70,7 @@ jobs:
           fi
 
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Get AWS instance type
         uses: ./.github/actions/get-aws-instance-type
@@ -98,15 +93,15 @@ jobs:
           # related issue: https://github.com/actions/checkout/issues/1779
           export HOME=${RUNNER_TEMP}
           git config --global --add safe.directory '*'
-          git submodule update --init --recursive --depth 1 thirdparty/imgui thirdparty/parallel-hashmap thirdparty/mrbind-pybind11 thirdparty/mrbind
+          git submodule update --init --recursive --depth 1 thirdparty/imgui thirdparty/eigen thirdparty/parallel-hashmap thirdparty/mrbind-pybind11 thirdparty/mrbind
 
       - name: Install thirdparty libs
         run: |
           ln -s /usr/local/lib/meshsdk-thirdparty-lib/lib ./lib
           ln -s /usr/local/lib/meshsdk-thirdparty-lib/include ./include
 
       - name: Install MRBind
-        if: ${{ ( inputs.mrbind && matrix.os != 'ubuntu20' ) || inputs.mrbind_c }}
+        if: ${{ inputs.mrbind || inputs.mrbind_c }}
         run: scripts/mrbind/install_mrbind_ubuntu.sh
 
       - name: Create virtualenv
@@ -145,7 +140,7 @@ jobs:
           MR_CMAKE_OPTIONS: >
             -DMR_CXX_STANDARD=${{ matrix.cxx-standard }}
             -DMR_PCH_USE_EXTRA_HEADERS=ON
-            -DMESHSDK_BUILD_MRMESH_PY_LEGACY=${{ fromJSON('["ON", "OFF"]')[inputs.mrbind && matrix.os != 'ubuntu20'] }}
+            -DMESHSDK_BUILD_MRMESH_PY_LEGACY=${{ fromJSON('["ON", "OFF"]')[inputs.mrbind] }}
             -DMESHSDK_BUILD_GENERATED_C_BINDINGS=${{ fromJSON('["OFF", "ON"]')[inputs.mrbind_c] }}
             -DMRVIEWER_NO_XDG_DESKTOP_PORTAL=ON
 
@@ -261,5 +256,6 @@ jobs:
         continue-on-error: true
         uses: ./.github/actions/collect-artifact-stats
         with:
-          artifact_path: meshsdk_${{matrix.os}}-arm64-dev.deb
+          artifact_path: ${{ github.workspace }}
+          artifact_glob: meshsdk_${{matrix.os}}-arm64-dev.deb
           stats_file_suffix: -${{ steps.collect-runner-stats.outputs.job_id }}