Skip to content

Commit f2189a3

Browse files
Merge branch 'main' into custom-vector-source-upstream
2 parents 9155b73 + 5f14c55 commit f2189a3

267 files changed

Lines changed: 3444 additions & 962 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.5.0
1+
8.6.0

.github/actions/android-build-and-upload-render-test/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
working-directory: ./render-test/android
1717

1818
- name: Upload APK files for ${{ inputs.flavor }}
19-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
19+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
2020
with:
2121
name: android-render-tests-${{ inputs.flavor }}
2222
if-no-files-found: error

.github/actions/configure-sccache-s3/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ runs:
2222

2323
- name: Configure AWS Credentials
2424
if: fromJSON(inputs.vars).OIDC_AWS_ROLE_TO_ASSUME
25-
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v4
25+
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d # v6.2.2
2626
with:
2727
aws-region: us-west-2
2828
role-to-assume: ${{ fromJSON(inputs.vars).OIDC_AWS_ROLE_TO_ASSUME }}

.github/actions/download-workflow-run-artifact/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
steps:
1313
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_run
1414
- name: Download ${{ inputs.artifact-name }} artifact
15-
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
15+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
1616
with:
1717
script: |
1818
let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -38,7 +38,7 @@ runs:
3838
3939
- name: "Check .zip file existence"
4040
id: zip_exists
41-
uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2.0.0
41+
uses: andstor/file-existence-action@558493d6c74bf472d87c84eab196434afc2fa029 # v3.1.0
4242
with:
4343
files: ${{ inputs.artifact-name }}.zip
4444

@@ -48,7 +48,7 @@ runs:
4848
run: unzip ${{ inputs.artifact-name }}.zip
4949

5050
- name: "Check file existence"
51-
uses: andstor/file-existence-action@20b4d2e596410855db8f9ca21e96fbe18e12930b # v2.0.0
51+
uses: andstor/file-existence-action@558493d6c74bf472d87c84eab196434afc2fa029 # v3.1.0
5252
if: ${{ inputs.expect-files }}
5353
with:
5454
fail: true

.github/actions/save-pr-number/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
echo "${{ github.event.number }}" > ./pr_number
1111
1212
- name: Upload pr_number
13-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
13+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
1414
with:
1515
name: pr-number
1616
path: ./pr_number

.github/actions/setup-android-ci/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
steps:
66
- name: Free Disk Space (Ubuntu)
77
if: startsWith(runner.name, 'GitHub Actions')
8-
uses: jlumbroso/free-disk-space@main
8+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
99
with:
1010
tool-cache: true
1111
android: false
@@ -23,13 +23,13 @@ runs:
2323
- run: echo "cmake.dir=$(dirname "$(dirname "$(command -v cmake)")")" >> local.properties
2424
shell: bash
2525

26-
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
26+
- uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5.5.0
2727
with:
2828
distribution: "temurin"
2929
java-version: "17"
3030

3131
- name: restore-gradle-cache
32-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
32+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
3333
env:
3434
cache-name: gradle-v1
3535
with:
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: tree-is-clean
2+
description: "Check whether previous steps left the Git working tree clean"
3+
inputs:
4+
check_untracked:
5+
description: "Fail on newly added files, or only on changes to tracked files"
6+
required: false
7+
default: "true"
8+
runs:
9+
using: "composite"
10+
steps:
11+
- name: Check Git working tree
12+
shell: bash
13+
env:
14+
CHECK_UNTRACKED: ${{ inputs.check_untracked }}
15+
run: |
16+
set -euo pipefail
17+
18+
status_args=(status --porcelain)
19+
if [ "${CHECK_UNTRACKED}" = "false" ]; then
20+
status_args+=(-uno)
21+
fi
22+
23+
status="$(git "${status_args[@]}")"
24+
25+
if [ -n "${status}" ]; then
26+
printf '%s\n' "${status}"
27+
28+
message="These files have changed since checkout. Check for out-of-sync autogenerated files"
29+
if [ "${CHECK_UNTRACKED}" != "false" ]; then
30+
message="${message}, or for untracked files written inside the working tree"
31+
fi
32+
33+
echo "::error::${message}"
34+
echo "::group::Full diff:"
35+
git diff
36+
echo "::endgroup::"
37+
exit 1
38+
fi

.github/scripts/notify-release-on-prs.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ async function createOrUpdateReleaseNotification({
7474
return `MapLibre iOS ${version}`;
7575
} else if (platform === 'android') {
7676
return `MapLibre Android ${version}`;
77+
} else if (platform === 'macos') {
78+
return `MapLibre macOS ${version}`;
7779
}
7880
return tag;
7981
}

.github/workflows/android-ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626
outputs:
2727
should_skip: ${{ github.event_name != 'workflow_dispatch' && steps.changed-files.outputs.android_any_modified != 'true' }}
2828
steps:
29-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
29+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3030
with:
3131
submodules: recursive
3232
persist-credentials: false
3333

3434
- name: Get all Android files that have changed
3535
if: github.event_name != 'workflow_dispatch'
3636
id: changed-files
37-
uses: tj-actions/changed-files@22103cc46bda19c2b464ffe86db46df6922fd323 # v47.0.5
37+
uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
3838
with:
3939
files_yaml_from_source_file: .github/changed-files.yml
4040

@@ -57,14 +57,14 @@ jobs:
5757
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
5858
SENTRY_DSN: ${{ secrets.SENTRY_DSN_ANDROID }}
5959
steps:
60-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
60+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6161
with:
6262
submodules: recursive
6363
persist-credentials: false
6464

6565
- uses: ./.github/actions/setup-android-ci
6666

67-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v4
67+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
6868
with:
6969
node-version-file: ".nvmrc"
7070

@@ -101,7 +101,7 @@ jobs:
101101
echo "SENTRY_ORG=maplibre" >> "$GITHUB_ENV"
102102
echo "SENTRY_PROJECT=maplibre-android" >> "$GITHUB_ENV"
103103
104-
- uses: infotroph/tree-is-clean@69d598a958e8cb8f3d0e3d52b5ebcd8684f2adc2 # v1.0.6
104+
- uses: ./.github/actions/tree-is-clean
105105
with:
106106
check_untracked: true
107107

@@ -152,7 +152,7 @@ jobs:
152152
153153
- name: Create artifact for benchmark APKs
154154
if: matrix.renderer == 'opengl'
155-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
155+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
156156
with:
157157
if-no-files-found: error
158158
name: benchmarkAPKs
@@ -187,7 +187,7 @@ jobs:
187187
run: sentry-cli debug-files upload MapLibreAndroidTestApp
188188

189189
- name: Upload android-ui-test-${{ matrix.renderer }}
190-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
190+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
191191
with:
192192
if-no-files-found: error
193193
name: android-ui-test-${{ matrix.renderer }}
@@ -210,7 +210,7 @@ jobs:
210210
working-directory: test/android
211211

212212
steps:
213-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
213+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
214214
with:
215215
submodules: recursive
216216
persist-credentials: false
@@ -233,7 +233,7 @@ jobs:
233233
cp app/build/outputs/apk/androidTest/release/app-release-androidTest.apk .
234234
235235
- name: Store C++ Unit Tests .apk files
236-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
236+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
237237
with:
238238
name: android-cpp-tests
239239
if-no-files-found: error
@@ -255,7 +255,7 @@ jobs:
255255
if: needs.pre_job.outputs.should_skip != 'true'
256256

257257
steps:
258-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
258+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
259259
with:
260260
submodules: recursive
261261
persist-credentials: false
@@ -283,7 +283,7 @@ jobs:
283283
env:
284284
IS_LOCAL_DEVELOPMENT: false
285285
steps:
286-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
286+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
287287
with:
288288
submodules: recursive
289289
persist-credentials: false
@@ -316,15 +316,15 @@ jobs:
316316
C_COMPILER: aarch64-linux-android26-clang
317317
BINDGEN_TARGET: aarch64-linux-android26
318318
steps:
319-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
319+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
320320
with:
321321
submodules: recursive
322322
persist-credentials: false
323323

324324
- uses: ./.github/actions/setup-android-ci
325325

326326
- name: Install Rust toolchain
327-
uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable
327+
uses: dtolnay/rust-toolchain@4be7066ada62dd38de10e7b70166bc74ed198c30 # stable
328328
with:
329329
toolchain: stable
330330

@@ -390,13 +390,13 @@ jobs:
390390

391391
# automatically trigger android-release when code is pushed to main
392392
# and the platform/android/VERSION file has changed
393-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
393+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
394394
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
395395

396396
- name: VERSION file changed
397397
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
398398
id: version-file-android-changed
399-
uses: tj-actions/changed-files@22103cc46bda19c2b464ffe86db46df6922fd323 # v47.0.5
399+
uses: tj-actions/changed-files@9426d40962ed5378910ee2e21d5f8c6fcbf2dd96 # v47.0.6
400400
with:
401401
files: platform/android/VERSION
402402

.github/workflows/android-device-test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ jobs:
7878
runs-on: ubuntu-latest
7979
if: github.repository_owner == 'maplibre' && github.event.workflow_run.conclusion == 'success'
8080
steps:
81-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v4
81+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
8282
with:
8383
persist-credentials: false
8484

85-
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v4
85+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
8686
with:
8787
node-version-file: '.nvmrc'
8888

@@ -102,7 +102,7 @@ jobs:
102102
id: get-pr-number
103103

104104
- name: Generate token
105-
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
105+
uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
106106
id: generate_token
107107
with:
108108
skip-token-revoke: true # revoking will fail for long running workflows, because the token will already have expired
@@ -128,7 +128,7 @@ jobs:
128128
run:
129129
echo "run_device_test=true" >> "$GITHUB_ENV"
130130

131-
- uses: LouisBrunner/checks-action@dfcbcf801bff1ea7f1414824fc28f2cd697b35da # v3.0.0
131+
- uses: LouisBrunner/checks-action@937cbbcde3259005b50746dc91cde29098aac2ff # v3.1.0
132132
id: create_check
133133
with:
134134
token: ${{ steps.generate_token.outputs.token }}
@@ -145,7 +145,7 @@ jobs:
145145

146146
- name: Configure AWS Credentials
147147
if: env.run_device_test == 'true'
148-
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7 # v4
148+
uses: aws-actions/configure-aws-credentials@517a711dbcd0e402f90c77e7e2f81e849156e31d # v6.2.2
149149
with:
150150
aws-region: us-west-2
151151
role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
@@ -198,20 +198,20 @@ jobs:
198198
199199
- name: Upload Test Artifacts
200200
if: (matrix.test.name == 'Android Benchmark' || failure()) && env.run_device_test == 'true'
201-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
201+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
202202
with:
203203
name: "Test Artifacts ${{ matrix.test.name }}"
204204
path: test_artifacts.zip
205205

206206
- name: Generate another token (previous one could have expired)
207207
if: always()
208-
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
208+
uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
209209
id: generate_token_2
210210
with:
211211
app-id: ${{ secrets.MAPLIBRE_NATIVE_BOT_APP_ID }}
212212
private-key: ${{ secrets.MAPLIBRE_NATIVE_BOT_PRIVATE_KEY }}
213213

214-
- uses: LouisBrunner/checks-action@dfcbcf801bff1ea7f1414824fc28f2cd697b35da # v3.0.0
214+
- uses: LouisBrunner/checks-action@937cbbcde3259005b50746dc91cde29098aac2ff # v3.1.0
215215
if: always()
216216
with:
217217
token: ${{ steps.generate_token_2.outputs.token }}

0 commit comments

Comments
 (0)