Skip to content

Commit

Permalink
Add TaggedScheduler
Browse files Browse the repository at this point in the history
  • Loading branch information
mwilsnd committed May 31, 2024
2 parents 6ad5b5c + 9e31738 commit 29721df
Show file tree
Hide file tree
Showing 120 changed files with 2,908 additions and 913 deletions.
1 change: 1 addition & 0 deletions .github/actionlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ self-hosted-runner:
# Labels of self-hosted runner in array of strings.
labels:
- macos-14 # can be removed once actionlint is updated
- ubuntu-24.04 # can be removed once actionlint is updated
# Configuration variables in array of strings defined in your repository or
# organization. `null` means disabling configuration variables check.
# Empty array means no configuration variable is allowed.
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/qt5-build/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -e
set -x

export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
export PATH="$Qt5_Dir/bin:$PATH"
export PATH="$QT_ROOT_DIR/bin:$PATH"

mkdir build && cd build
cmake ../source/ \
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/qt6-build/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -e
set -x

export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
export PATH="$Qt6_DIR/bin:$PATH"
export PATH="$QT_ROOT_DIR/bin:$PATH"

mkdir build && cd build
qt-cmake ../source/ \
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/android-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ jobs:
- name: Build libmaplibre.so for arm-v8
run: make android-lib-arm-v8

- name: Build documentation
run: ./gradlew dokkaHtml

- name: Copy developer config with API key for UI tests
if: github.ref == 'refs/heads/main'
run: |
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/gh-pages-android-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,18 @@ jobs:
- name: Checkout 🛎️
uses: actions/checkout@v4

- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "17"

- name: Generate documentation
run: ./gradlew dokkaHtml

- name: Deploy 🚀
uses: JamesIves/[email protected].0
uses: JamesIves/[email protected].1
with:
branch: gh-pages
folder: platform/android/MapLibreAndroid/build/dokka/html
target-folder: android/api/

2 changes: 1 addition & 1 deletion .github/workflows/gh-pages-cpp-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: doxygen

- name: Deploy 🚀
uses: JamesIves/[email protected].0
uses: JamesIves/[email protected].1
with:
branch: gh-pages
folder: docs/doxygen/html
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages-mdbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
name: book
path: artifacts/book
- name: Deploy
uses: JamesIves/[email protected].0
uses: JamesIves/[email protected].1
with:
branch: gh-pages
folder: artifacts/book
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
- name: Deploy DocC documentation (main) 🚀
if: github.ref == 'refs/heads/main'
uses: JamesIves/[email protected].0
uses: JamesIves/[email protected].1
with:
branch: gh-pages
folder: build/docs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,12 @@ jobs:
run: xvfb-run -a build/mbgl-render-test-runner --manifestPath=metrics/linux-${{ matrix.renderer }}.json

- name: Upload render test result
if: always() && steps.render_test.outcome == 'failure' && matrix.renderer == 'drawable'
if: always() && steps.render_test.outcome == 'failure'
uses: actions/upload-artifact@v4
with:
name: render-test-result
name: render-test-result-${{ matrix.renderer }}
path: |
metrics/linux-drawable.html
metrics/linux-${{ matrix.renderer }}.html
# expression tests

Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/qt-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ jobs:
- name: Linux
os: ubuntu-22.04
build_type: RelWithDebInfo
qt_version: 6.5.3
qt_version: 6.7.0
qt_target: desktop
compiler: ""
- name: Linux_GCC13
os: ubuntu-22.04
os: ubuntu-24.04
build_type: RelWithDebInfo
qt_version: 6.5.3
qt_version: 6.7.0
qt_target: desktop
compiler: "gcc-13"
- name: macOS
Expand All @@ -88,19 +88,19 @@ jobs:
- name: macOS
os: macos-14
build_type: RelWithDebInfo
qt_version: 6.6.2
qt_version: 6.7.0
qt_target: desktop
deployment_target: 11.0
deployment_arch: "x86_64;arm64"
compiler: ""
- name: macOS_LLVM17
- name: macOS_LLVM18
os: macos-14
build_type: RelWithDebInfo
qt_version: 6.6.2
qt_version: 6.7.0
qt_target: desktop
deployment_target: 11.0
deployment_arch: "arm64"
compiler: "llvm@17"
compiler: "llvm"
- name: win64_msvc2019
os: windows-2022
build_type: "RelWithDebInfo"
Expand All @@ -115,7 +115,7 @@ jobs:
build_type: "RelWithDebInfo"
compiler_type: x64
compiler_version: 14.29
qt_version: 6.5.3
qt_version: 6.7.0
qt_target: desktop
qt_arch: win64_msvc2019_64
qt_tools: ""
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
libxcb-render-util0 \
libxcb-xinerama0 \
libxcb-xfixes0 \
libegl1-mesa \
libegl1 \
fonts-noto-cjk
- name: Install compiler
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
uses: seanmiddleditch/gha-setup-ninja@v4

- name: Download Qt
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
aqtversion: ==3.1.*
version: ${{ env.QT_VERSION }}
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos:
- id: check-yaml
args: [--allow-multiple-documents]
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.4
rev: v18.1.5
hooks:
- id: clang-format
files: '.*\.(hpp|cpp|h)'
Expand All @@ -15,12 +15,12 @@ repos:
hooks:
- id: buildifier
- repo: https://github.com/Mateusz-Grzelinski/actionlint-py
rev: v1.6.27.13
rev: v1.7.0.14
hooks:
- id: actionlint
additional_dependencies: [shellcheck-py]
- repo: https://github.com/nicklockwood/SwiftFormat
rev: "0.53.8"
rev: "0.53.10"
hooks:
- id: swiftformat
args: [--swiftversion, "5.8"]
Expand Down
7 changes: 5 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ endif()
project("Mapbox GL Native" LANGUAGES CXX C)

set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER Core)
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER MapLibre)

set(
MEMORYCHECK_COMMAND_OPTIONS
Expand Down Expand Up @@ -92,6 +92,7 @@ target_compile_options(
$<$<CXX_COMPILER_ID:GNU>:-Wno-error=return-type>
$<$<CXX_COMPILER_ID:GNU>:-Wno-error=unknown-pragmas>
$<$<CXX_COMPILER_ID:GNU>:-Wno-error=pragmas>
$<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>
$<$<CXX_COMPILER_ID:AppleClang>:-Wno-unknown-warning-option>
$<$<AND:$<CXX_COMPILER_ID:AppleClang>,$<NOT:$<BOOL:${MLN_WITH_QT}>>>:-Wno-error=deprecated-declarations>
$<$<AND:$<CXX_COMPILER_ID:AppleClang>,$<NOT:$<BOOL:${MLN_WITH_QT}>>>:-Wno-error=unused-parameter>
Expand Down Expand Up @@ -149,6 +150,7 @@ if(MLN_DRAWABLE_RENDERER)
${PROJECT_SOURCE_DIR}/include/mbgl/gfx/drawable_tweaker.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/gfx/drawable_atlases_tweaker.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/gfx/drawable_custom_layer_host_tweaker.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/gfx/gpu_expression.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/gfx/uniform_block.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/gfx/uniform_buffer.hpp
${PROJECT_SOURCE_DIR}/include/mbgl/gfx/vertex_attribute.hpp
Expand Down Expand Up @@ -177,6 +179,7 @@ if(MLN_DRAWABLE_RENDERER)
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/drawable_builder_impl.cpp
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/drawable_atlases_tweaker.cpp
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/drawable_custom_layer_host_tweaker.cpp
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/gpu_expression.cpp
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/hillshade_prepare_drawable_data.hpp
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/image_drawable_data.hpp
${PROJECT_SOURCE_DIR}/src/mbgl/gfx/line_drawable_data.hpp
Expand Down Expand Up @@ -1419,7 +1422,7 @@ set_target_properties(
INTERFACE_MAPBOX_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE.md
)

set_property(TARGET mbgl-core PROPERTY FOLDER Core)
set_property(TARGET mbgl-core PROPERTY FOLDER MapLibre)

add_library(
Mapbox::Map ALIAS mbgl-core
Expand Down
37 changes: 8 additions & 29 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
## Documentation

- For a high-level overview of MapLibre Native, check out the [MapLibre Native Markdown Book](https://maplibre.org/maplibre-native/docs/book/).
- See [`DEVELOPING.md`](DEVELOPING.md) for getting started with development.

## Source code checkout

```bash
git clone --recurse-submodules https://github.com/maplibre/maplibre-native.git
```


## Guidelines

If you want to contribute code:
Expand All @@ -22,15 +20,7 @@ If you want to contribute code:

1. Pull requests are gladly accepted. If there are any changes that developers using one of the platforms should be aware of, please update the **main** section of the relevant `CHANGELOG.md`.

Please note the special instructions for contributing new source code files, asset files, or user-facing strings to MapLibre Native for [iOS](platform/ios/CONTRIBUTING.md), [Android](platform/android/DEVELOPING.md) or [macOS](platform/macos/DEVELOPING.md).

## Pull Requests

To run the benchmarks (for Android) include the following line on a PR comment:

```
!benchmark android
```
Please note the special instructions for contributing new source code files, asset files, or user-facing strings to MapLibre Native for [iOS](platform/ios/CONTRIBUTING.md), [Android](platform/android/DEVELOPING.md) or [macOS](platform/macos/README.md).

## Design Proposals

Expand All @@ -47,25 +37,14 @@ The steps for a Design Proposal are the following:
5. Call a vote on the Design Proposal once discussions have settled. People in favor of your Design Proposal shall approve the pull request. People against your Design Proposal shall comment on the pull request with something like "Rejected".
6. Give the community at least 72 hours to vote. If a majority of the people who voted accept your Proposal, it can be merged.

## Semantic Versioning
[Accepted design proposals](https://github.com/maplibre/maplibre-native/tree/main/design-proposals).

MapLibre uses tags for releases based on [SemVer](https://semver.org) versioning. This is useful for checking out a particular released version for feature enhancements or debugging.
## Pre-commit hooks

You can list available tags by issuing the command `git tag`, then use the result
Install [pre-commit](https://pre-commit.com/) and run

```bash
# 1. Obtain a list of tags, which matches to release versions
git tag

# 2. Set a convenience variable with the desired TAG
# TAG=android-v9.4.2
# TAG=android-v9.5.2
TAG=ios-v5.12.0
# TAG=ios-v5.12.0-pre.1

# 3. Check out a particular TAG
git checkout tags/$TAG -b $TAG

# 4. build, debug or enhance features based on the tag
# clean, if you need to troubleshoot build dependencies by using `make clean`
```
pre-commit install
```

to install the pre-commit hooks configured in `.pre-commit-config.yml`.
Loading

0 comments on commit 29721df

Please sign in to comment.