diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cba494f3b70f89a35868f04e7ec8682af299e931..b31ae61579ef16b4eaaf04923159d24691cb0493 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -229,24 +229,25 @@ test-linux: reports: junit: junit_pytest.xml -# Do not support mac with dynamic linking -.test-mac-m1: +# Note: on mac we use static_build feature. This has two benefits: +# 1) static_build gets actually checked in CI +# 2) its simpler to not have more dependencies on mac +test-mac-m1: extends: .test tags: - mac-dev-m1 script: - export CARGO_HOME=$HOME/.cargo - cargo -V - - cargo build --locked - - cargo build --features webui --locked + - cargo build --features static_build --locked + - cargo build --features "static_build webui" --locked # There are no Rust tests for `webui` feature. # It will be checked during integration tests. - - cargo test --locked + - cargo test --features static_build --locked - cargo fmt -- -v --check - cargo clippy --version - # Do not use --all-features here because it'll trigger tarantool rebuild with static build - - cargo clippy --features "load_test webui error_injection" -- --deny clippy::all --no-deps + - cargo clippy --features "static_build load_test webui error_injection" -- --deny clippy::all --no-deps # - | # # Pipenv install # ci-log-section start "pipenv-install" Installing pip dependencies ...