diff --git a/.github/workflows/rust-ci.yaml b/.github/workflows/rust-ci.yaml index f750de407d5..dcc6ce627e5 100644 --- a/.github/workflows/rust-ci.yaml +++ b/.github/workflows/rust-ci.yaml @@ -9,13 +9,20 @@ on: defaults: run: - shell: bash working-directory: rustutils/ jobs: test: name: Rust tests - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + fail-fast: true + matrix: + include: + - os: macos-latest # M-series CPU + - os: macos-13 # x64 CPU + - os: windows-latest + - os: ubuntu-latest steps: - uses: taiki-e/install-action@v2 with: { tool: just } diff --git a/.gitignore b/.gitignore index 8e5e2b2abb4..a15a2d84269 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,8 @@ cache.sqlite cache.sqlite-journal out.png /test/android/app/build + +# Rust +**/target/ +**/*.rs.bk +**/*.profraw diff --git a/include/mbgl/util/tile_server_options.hpp b/include/mbgl/util/tile_server_options.hpp index 8fc1b943f6a..2182f34d9f2 100644 --- a/include/mbgl/util/tile_server_options.hpp +++ b/include/mbgl/util/tile_server_options.hpp @@ -265,7 +265,7 @@ class TileServerOptions final { TileServerOptions& withDefaultStyles(std::vector styles); /** - * @brief Sets the default style by name. The style name must exists in + * @brief Sets the default style by name. The style name must exist in * defaultStyles collection * * @param defaultStyle The style name