Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-test-distribute.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -144,11 +144,11 @@ 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
steps:
Expand Down
22 changes: 21 additions & 1 deletion .github/workflows/build-test-linux-vcpkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -198,7 +202,6 @@ jobs:
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
Expand Down Expand Up @@ -253,3 +256,20 @@ jobs:
artifact_path: ${{ github.workspace }}
artifact_glob: meshlib_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
13 changes: 4 additions & 9 deletions .github/workflows/build-test-ubuntu-arm64.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and test on arm64 ubuntu20 and ubuntu22
name: Build and test Ubuntu arm64

on:
workflow_call:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -106,7 +101,7 @@ jobs:
ln -s /usr/local/lib/meshlib-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
Expand Down Expand Up @@ -145,7 +140,7 @@ jobs:
MR_CMAKE_OPTIONS: >
-DMR_CXX_STANDARD=${{ matrix.cxx-standard }}
-DMR_PCH_USE_EXTRA_HEADERS=ON
-DMESHLIB_BUILD_MRMESH_PY_LEGACY=${{ fromJSON('["ON", "OFF"]')[inputs.mrbind && matrix.os != 'ubuntu20'] }}
-DMESHLIB_BUILD_MRMESH_PY_LEGACY=${{ fromJSON('["ON", "OFF"]')[inputs.mrbind] }}
-DMESHLIB_BUILD_GENERATED_C_BINDINGS=${{ fromJSON('["OFF", "ON"]')[inputs.mrbind_c] }}
-DMRVIEWER_NO_XDG_DESKTOP_PORTAL=ON

Expand Down
25 changes: 2 additions & 23 deletions .github/workflows/build-test-ubuntu-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ on:
default: true
required: false
type: boolean
nuget_build_patch:
default: false
required: false
type: boolean

jobs:
ubuntu-x64-build-test:
Expand Down Expand Up @@ -84,7 +80,7 @@ jobs:
ln -s /usr/local/lib/meshlib-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
Expand Down Expand Up @@ -117,7 +113,7 @@ jobs:
-DMR_CXX_STANDARD=${{ matrix.cxx-standard }}
-DMESHLIB_BUILD_MRCUDA=${{ matrix.build_mrcuda }}
-DMR_PCH_USE_EXTRA_HEADERS=ON
-DMESHLIB_BUILD_MRMESH_PY_LEGACY=${{ fromJSON('["ON", "OFF"]')[inputs.mrbind && matrix.os != 'ubuntu20'] }}
-DMESHLIB_BUILD_MRMESH_PY_LEGACY=${{ fromJSON('["ON", "OFF"]')[inputs.mrbind] }}
-DMESHLIB_BUILD_GENERATED_C_BINDINGS=${{ fromJSON('["OFF", "ON"]')[inputs.mrbind_c] }}
-DMRVIEWER_NO_XDG_DESKTOP_PORTAL=ON

Expand Down Expand Up @@ -231,20 +227,3 @@ jobs:
artifact_path: ${{ github.workspace }}
artifact_glob: meshlib_${{matrix.os}}-dev.deb
stats_file_suffix: -${{ steps.collect-runner-stats.outputs.job_id }}

- name: Create and fix fake Wheel for NuGet
if: ${{ inputs.nuget_build_patch && matrix.os == 'ubuntu20' && matrix.upload_release == 'ON' && matrix.compiler == 'GCC' && matrix.config == 'Release' }}
shell: bash
run: |
python3 -m venv ./wheel_venv
source ./wheel_venv/bin/activate
python3 -m pip install auditwheel
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.os == 'ubuntu20' && matrix.upload_release == 'ON' && matrix.compiler == 'GCC' && matrix.config == 'Release' }}
uses: actions/upload-artifact@v5
with:
name: DotNetPatchArchiveLinux-x64
path: ./patched_content/*
retention-days: 1
2 changes: 1 addition & 1 deletion .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
with:
filters: |
src:
- 'docker/(ubuntu20|ubuntu22|ubuntu24|emscripten)Dockerfile'
- 'docker/(ubuntu22|ubuntu24|emscripten)Dockerfile'
- 'requirements/(ubuntu|distribution_python).txt'
- 'scripts/build_thirdparty.sh'
- 'scripts/install_apt_requirements.sh'
Expand Down
40 changes: 0 additions & 40 deletions .github/workflows/matrix/ubuntu-x64-full-config.json
Original file line number Diff line number Diff line change
@@ -1,45 +1,5 @@
{
"include": [
{
"os": "ubuntu20",
"config": "Debug",
"compiler": "Clang",
"cxx-compiler": "/usr/bin/clang++-11",
"c-compiler": "/usr/bin/clang-11",
"cxx-standard": 20,
"build_mrcuda": "ON",
"upload_release": "OFF"
},
{
"os": "ubuntu20",
"config": "Debug",
"compiler": "GCC",
"cxx-compiler": "/usr/bin/g++-10",
"c-compiler": "/usr/bin/gcc-10",
"cxx-standard": 20,
"build_mrcuda": "ON",
"upload_release": "OFF"
},
{
"os": "ubuntu20",
"config": "Release",
"compiler": "Clang",
"cxx-compiler": "/usr/bin/clang++-11",
"c-compiler": "/usr/bin/clang-11",
"cxx-standard": 20,
"build_mrcuda": "ON",
"upload_release": "OFF"
},
{
"os": "ubuntu20",
"config": "Release",
"compiler": "GCC",
"cxx-compiler": "/usr/bin/g++-10",
"c-compiler": "/usr/bin/gcc-10",
"cxx-standard": 20,
"build_mrcuda": "ON",
"upload_release": "ON"
},
{
"os": "ubuntu22",
"config": "Debug",
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/matrix/ubuntu-x64-minimal-config.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
{
"include": [
{
"os": "ubuntu20",
"config": "Release",
"compiler": "GCC",
"cxx-compiler": "/usr/bin/g++-10",
"c-compiler": "/usr/bin/gcc-10",
"cxx-standard": 20,
"build_mrcuda": "ON",
"upload_release": "ON"
},
{
"os": "ubuntu22",
"config": "Release",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distro: [ ubuntu20, ubuntu22, ubuntu24, emscripten ]
distro: [ ubuntu22, ubuntu24, emscripten ]
arch: [ x64, arm64 ]
exclude:
- distro: emscripten
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/test-distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04" ]
os: [ "ubuntu:22.04", "ubuntu:24.04" ]
include:
- os: "ubuntu:20.04"
name: "ubuntu20"
compiler: clang-11
c-compiler: /usr/bin/clang-11
cxx-compiler: /usr/bin/clang++-11
- os: "ubuntu:22.04"
name: "ubuntu22"
compiler: clang-14
Expand Down Expand Up @@ -139,13 +134,8 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04" ]
os: [ "ubuntu:22.04", "ubuntu:24.04" ]
include:
- os: "ubuntu:20.04"
name: "ubuntu20"
compiler: clang-11
c-compiler: /usr/bin/clang-11
cxx-compiler: /usr/bin/clang++-11
- os: "ubuntu:22.04"
name: "ubuntu22"
compiler: clang-14
Expand Down
53 changes: 0 additions & 53 deletions .github/workflows/update-app-container.yml

This file was deleted.

Loading