Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
louwers authored Nov 14, 2024
2 parents c7350cb + 38bf215 commit 4e6006e
Show file tree
Hide file tree
Showing 564 changed files with 15,280 additions and 3,901 deletions.
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
6 changes: 5 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ Checks: [
-readability-suspicious-call-argument,
-readability-uppercase-literal-suffix,
-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
-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: '.*'
Expand Down
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 }} 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 4e6006e

Please sign in to comment.