Skip to content

Commit

Permalink
Merge branch 'main' into rust-css-color
Browse files Browse the repository at this point in the history
  • Loading branch information
louwers committed Jan 10, 2025
2 parents 5e404f4 + 57f42d9 commit f712840
Show file tree
Hide file tree
Showing 2,602 changed files with 92,974 additions and 26,234 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Input hashes for repository rule npm_translate_lock(name = "npm", pnpm_lock = "//:pnpm-lock.yaml").
# This file should be checked into version control along with the pnpm-lock.yaml file.
pnpm-lock.yaml=172204574
package.json=-1427231250
package.json=794269200
1 change: 1 addition & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
bazel-bin
bazel-out
bazel-testlogs
node_modules
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.2.1
7.3.1
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PackConstructorInitializers: Never
PenaltyBreakAssignment: 80
SortIncludes: false
SpacesBeforeTrailingComments: 1
Standard: c++17
Standard: c++20
---
Language: Cpp
---
Expand Down
10 changes: 8 additions & 2 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
Checks: >
Checks: [
android-*,
boost-*,
bugprone-*,
Expand Down Expand Up @@ -108,7 +108,13 @@ Checks: >
-readability-static-definition-in-anonymous-namespace,
-readability-suspicious-call-argument,
-readability-uppercase-literal-suffix,
-readability-use-anyofallof
-readability-use-anyofallof,
-modernize-loop-convert, # since C++20 this complains about reverse loops with iterators, but good ranges support only landed in clang 15
-performance-enum-size,
-misc-include-cleaner,
-readability-redundant-inline-specifier,
-readability-avoid-nested-conditional-operator
]
WarningsAsErrors: '*'
HeaderFilterRegex: '.*'
CheckOptions:
Expand Down
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Avoid line conversions between Unix (LF) and Windows (CRLF)

test/fixtures/storage/assets/* binary
67 changes: 67 additions & 0 deletions .github/ISSUE_TEMPLATE/android-bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: MapLibre Android Bug Report
description: Report a bug you encountered with MapLibre Android.
labels: ["android"]
type: "bug"
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: version
attributes:
label: MapLibre Android Version
placeholder: e.g. 11.6.2
validations:
required: true
- type: input
id: android-version
attributes:
label: Android SDK Version
placeholder: e.g. Android 10
validations:
required: true
- type: input
id: device
attributes:
label: Device
description: "Enter the device that you encountered the issue on or enter 'Simulator' if you only see this issue in a simulator."
placeholder: Google Pixel 7 Pro
validations:
required: true
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
validations:
required: true
- type: textarea
id: repro
attributes:
label: Steps to reproduce
description: Explain how the issue can be reproduced.
validations:
required: true
- type: dropdown
id: renderer
attributes:
label: Renderer
multiple: true
options:
- OpenGL (choose this if you are unsure)
- Vulkan
description: Mostly relevant for rendering issues.
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: textarea
id: context
attributes:
label: Additional context
description: Additional context such as screenshots or videos that are helpful.
validations:
required: false
19 changes: 13 additions & 6 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,40 @@
---
name: Bug report
about: Create a report to help us improve
name: General Bug report
about: Create a report to help us improve.
title: ''
labels: bug
type: bug
assignees: ''

---

<!-- If your issue is about MapLibre iOS or MapLibre Android, please use the corresponding template. -->

**Describe the bug**

A clear and concise description of what the bug is.

**To Reproduce**

Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**

A clear and concise description of what you expected to happen.

**Screenshots**

If applicable, add screenshots to help explain your problem.

**Platform information (please complete the following information):**
- OS: [e.g. iOS]
- Platform [e.g. Qt, Node.js, iOS]
- Version [e.g. 22]

- Operating System:
- Platform (e.g. Node.js, Qt):
- Version:

**Additional context**

Add any other context about the problem here.
58 changes: 58 additions & 0 deletions .github/ISSUE_TEMPLATE/ios-bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: MapLibre iOS Bug Report
description: Report a bug you encountered with MapLibre iOS.
labels: ["ios"]
type: "bug"
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: version
attributes:
label: MapLibre iOS Version
placeholder: e.g. 6.8.1
validations:
required: true
- type: input
id: ios-version
attributes:
label: iOS Version
placeholder: e.g. 6.8.1
validations:
required: true
- type: input
id: device
attributes:
label: Device
description: "Enter the device that you encountered the issue on or enter 'Simulator' if you only see this issue in a simulator."
placeholder: iPhone 15 Pro
validations:
required: true
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
validations:
required: true
- type: textarea
id: repro
attributes:
label: Steps to reproduce
description: Explain how the issue can be reproduced.
validations:
required: true
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: textarea
id: context
attributes:
label: Additional context
description: Additional context such as screenshots or videos that are helpful.
validations:
required: false
2 changes: 2 additions & 0 deletions .github/actionlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ self-hosted-runner:
labels:
- macos-14 # can be removed once actionlint is updated
- ubuntu-24.04 # can be removed once actionlint is updated
- MapLibre_Native_Ubuntu_22_04_ARM_8_core
- MapLibre_Native_Ubuntu_24_04_x84_16_core
# 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
25 changes: 25 additions & 0 deletions .github/actions/android-build-and-upload-render-test/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Build and Upload APKs
description: Build the APK and Android test APK for a given flavor, and upload them as artifacts
inputs:
flavor:
description: 'The build flavor (e.g., opengl, vulkan)'
required: true
runs:
using: "composite"
steps:
- name: Build APK and Android Test APK for ${{ inputs.flavor }}
shell: bash
run: |
./gradlew assemble${{ inputs.flavor }}Release assemble${{ inputs.flavor }}AndroidTest
cp app/build/outputs/apk/${{ inputs.flavor }}/release/app-${{ inputs.flavor }}-release.apk RenderTestsApp-${{ inputs.flavor }}.apk
cp app/build/outputs/apk/androidTest/${{ inputs.flavor }}/release/app-${{ inputs.flavor }}-release-androidTest.apk RenderTests-${{ inputs.flavor }}.apk
working-directory: ./render-test/android

- name: Upload APK files for ${{ inputs.flavor }}
uses: actions/upload-artifact@v4
with:
name: android-render-tests-${{ inputs.flavor }}
if-no-files-found: error
path: |
./render-test/android/RenderTestsApp-${{ inputs.flavor }}.apk
./render-test/android/RenderTests-${{ inputs.flavor }}.apk
139 changes: 0 additions & 139 deletions .github/actions/aws-device-farm-run/action.yml

This file was deleted.

Loading

0 comments on commit f712840

Please sign in to comment.