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
14 changes: 7 additions & 7 deletions .github/workflows/build-test-ubuntu-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
ln -s /usr/local/lib/meshlib-thirdparty-lib/include ./include

- name: Install MRBind
if: ${{ inputs.mrbind || inputs.mrbind_c }}
if: ${{ ( inputs.mrbind && matrix.os != 'ubuntu20' ) || inputs.mrbind_c }}
run: scripts/mrbind/install_mrbind_ubuntu.sh

- name: Create virtualenv
Expand Down Expand Up @@ -145,11 +145,11 @@ 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] }}
-DMESHLIB_BUILD_MRMESH_PY_LEGACY=${{ fromJSON('["ON", "OFF"]')[inputs.mrbind && matrix.os != 'ubuntu20'] }}
-DMESHLIB_BUILD_GENERATED_C_BINDINGS=${{ fromJSON('["OFF", "ON"]')[inputs.mrbind_c] }}

- name: Generate and build Python bindings
if: ${{ inputs.mrbind }}
if: ${{ inputs.mrbind && matrix.os != 'ubuntu20' }}
env:
CXX: ${{ matrix.cxx-compiler }}
run: make -f scripts/mrbind/generate.mk MODE=none -B --trace MESHLIB_SHLIB_DIR=build/${{matrix.config}}/bin
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
run: MR_LOCAL_RESOURCES=1 xvfb-run -a ./build/${{ matrix.config }}/bin/MeshViewer -hidden -noEventLoop -unloadPluginsAtEnd

- name: Unit Tests
run: ./build/${{ matrix.config }}/bin/MRTest
run: ./build/${{ matrix.config }}/bin/MRTest ${{ matrix.os == 'ubuntu20' && '--no-python-tests' || '' }}

- name: C Unit Tests (old bindings)
run: ./build/${{ matrix.config }}/bin/MRTestC
Expand All @@ -191,20 +191,20 @@ jobs:
run: ./build/${{ matrix.config }}/bin/MRTestC2

- name: Python Sanity Tests
if: ${{ inputs.mrbind && matrix.os != 'ubuntu20' }}
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 }}
if: ${{ inputs.internal_build && ( inputs.mrbind && matrix.os != 'ubuntu20' ) }}
uses: ./.github/actions/python-regression-tests
with:
build_config: ${{ matrix.config }}
mrbind: ${{ inputs.mrbind }}
mrbind: true
pytest_args: "--run-cuda=negative"
smoke: ${{ !inputs.full_config_build && matrix.config == 'Debug' }}
test_artifacts_path: ubuntu_arm64/${{ matrix.os }}
ubuntu20_arm_workaround: ${{ inputs.mrbind && matrix.os == 'ubuntu20' }}
upload_test_artifacts: ${{ inputs.upload_test_artifacts }}

- name: Create Deb
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/build-test-ubuntu-x64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
ln -s /usr/local/lib/meshlib-thirdparty-lib/include ./include

- name: Install MRBind
if: ${{ inputs.mrbind || inputs.mrbind_c }}
if: ${{ ( inputs.mrbind && matrix.os != 'ubuntu20' ) || inputs.mrbind_c }}
run: scripts/mrbind/install_mrbind_ubuntu.sh

- name: Create virtualenv
Expand Down Expand Up @@ -116,11 +116,11 @@ 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] }}
-DMESHLIB_BUILD_MRMESH_PY_LEGACY=${{ fromJSON('["ON", "OFF"]')[inputs.mrbind && matrix.os != 'ubuntu20'] }}
-DMESHLIB_BUILD_GENERATED_C_BINDINGS=${{ fromJSON('["OFF", "ON"]')[inputs.mrbind_c] }}

- name: Generate and build Python bindings
if: ${{ inputs.mrbind }}
if: ${{ inputs.mrbind && matrix.os != 'ubuntu20' }}
env:
CXX: ${{ matrix.cxx-compiler }}
ENABLE_CUDA: ${{ fromJSON('{"ON":1, "OFF":0}') [matrix.build_mrcuda] }}
Expand All @@ -141,7 +141,7 @@ jobs:
run: MR_LOCAL_RESOURCES=1 xvfb-run -a ./build/${{ matrix.config }}/bin/MeshViewer -hidden -noEventLoop -unloadPluginsAtEnd

- name: Unit Tests
run: ./build/${{ matrix.config }}/bin/MRTest
run: ./build/${{ matrix.config }}/bin/MRTest ${{ matrix.os == 'ubuntu20' && '--no-python-tests' || '' }}

- name: C Unit Tests (old bindings)
run: ./build/${{ matrix.config }}/bin/MRTestC
Expand All @@ -151,18 +151,19 @@ jobs:
run: ./build/${{ matrix.config }}/bin/MRTestC2

- name: Python Sanity Tests
if: ${{ inputs.mrbind && matrix.os != 'ubuntu20' }}
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 }}
if: ${{ inputs.internal_build && ( inputs.mrbind && matrix.os != 'ubuntu20' ) }}
env:
RUN_CUDA_ARG: "--run-cuda=negative"
uses: ./.github/actions/python-regression-tests
with:
build_config: ${{ matrix.config }}
mrbind: ${{ inputs.mrbind }}
mrbind: true
pytest_args: ${{ env.RUN_CUDA_ARG }}
smoke: ${{ !inputs.full_config_build && matrix.config == 'Debug' }}
test_artifacts_path: ${{ matrix.os }}/${{matrix.config}}/${{matrix.compiler}}
Expand Down
3 changes: 0 additions & 3 deletions docker/ubuntu20Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ COPY scripts/mrbind/clang_version.txt scripts/mrbind/clang_version.txt
COPY scripts/install_thirdparty.sh scripts/install_thirdparty.sh
COPY scripts/patches scripts/patches
COPY requirements requirements
COPY scripts/mrbind-pybind11/python_versions.txt scripts/mrbind-pybind11/python_versions.txt
COPY scripts/mrbind-pybind11/install_all_python_versions_ubuntu_pkgs.sh scripts/mrbind-pybind11/install_all_python_versions_ubuntu_pkgs.sh

COPY --from=build /home/MeshLib/lib /usr/local/lib/meshlib-thirdparty-lib/lib
COPY --from=build /home/MeshLib/include /usr/local/lib/meshlib-thirdparty-lib/include
Expand All @@ -56,7 +54,6 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
tzdata git sudo time xvfb curl unzip ninja-build \
&& ./scripts/install_apt_requirements.sh \
&& ./scripts/mrbind/install_deps_ubuntu.sh \
&& ./scripts/mrbind-pybind11/install_all_python_versions_ubuntu_pkgs.sh \
&& curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
&& apt-get update -y \
Expand Down
Loading