Skip to content

Commit 3e9dd0f

Browse files
committed
Merge branch 'main' into mlt
* main: Create macOS amalgamation for core releases (maplibre#3768) Add weak pointer handling (maplibre#3763) Temporarily disable Windows CI (maplibre#3775) chore(ci): pin actions to shas (maplibre#3769) Fix compile error when building with MLN_USE_TRACY (maplibre#3774) set MLN_WITH_OPENGL=OFF by default, like Metal/Vulkan (maplibre#3772) Tweak Linux amalgamation (maplibre#3767) Tweak layer depth distribution (maplibre#3738) Add Sentry build tags (maplibre#3765) Release MapLibre Android 11.13.1 (maplibre#3761) Release MapLibre iOS 6.18.1 (maplibre#3762) Add weak pointer management to RasterSource and derived classes (maplibre#3726) Fix UB in TaggedString constructor (maplibre#3748) Add Compose Multiplatform section to README (maplibre#3751) format Bazel files with buildifier (maplibre#3756) use separate install-sccache script (maplibre#3755) Fix Android backend cleanup (maplibre#3681) # Conflicts: # include/mbgl/style/sources/raster_dem_source.hpp # include/mbgl/style/sources/vector_source.hpp # platform/ios/BUILD.bazel
2 parents 54b1431 + 9b6325a commit 3e9dd0f

File tree

89 files changed

+583
-285
lines changed

Some content is hidden

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

89 files changed

+583
-285
lines changed

.github/actions/install-sccache/action.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,5 @@ runs:
44
using: "composite"
55
steps:
66
- name: Install sccache
7-
run: |
8-
curl -LO https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz
9-
tar -xzf sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz
10-
sudo mv sccache-v0.10.0-x86_64-unknown-linux-musl/sccache /usr/bin/sccache
11-
sudo chmod +x /usr/bin/sccache
12-
rm -rf sccache-v0.10.0-x86_64-unknown-linux-musl*
7+
run: ${{ github.action_path }}/install-sccache
138
shell: bash
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
curl -LO https://github.com/mozilla/sccache/releases/download/v0.10.0/sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz
4+
tar -xzf sccache-v0.10.0-x86_64-unknown-linux-musl.tar.gz
5+
sudo mv sccache-v0.10.0-x86_64-unknown-linux-musl/sccache /usr/bin/sccache
6+
sudo chmod +x /usr/bin/sccache
7+
rm -rf sccache-v0.10.0-x86_64-unknown-linux-musl*

.github/scripts/install-linux-deps

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
1010
libwebp-dev \
1111
libopengl0 \
1212
mesa-vulkan-drivers \
13-
llvm
14-
cargo install [email protected]
13+
llvm \
14+
glslang-dev \
15+
libbz2-dev

.github/workflows/android-ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ 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@v4
29+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
3030
with:
3131
submodules: recursive
3232

3333
- name: Get all Android files that have changed
3434
if: github.event_name != 'workflow_dispatch'
3535
id: changed-files
36-
uses: tj-actions/changed-files@v46
36+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
3737
with:
3838
files_yaml_from_source_file: .github/changed-files.yml
3939

@@ -54,14 +54,14 @@ jobs:
5454
IS_LOCAL_DEVELOPMENT: false
5555
MLN_ANDROID_STL: c++_static
5656
steps:
57-
- uses: actions/checkout@v4
57+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
5858
with:
5959
submodules: recursive
6060
fetch-depth: 0
6161

6262
- uses: ./.github/actions/setup-android-ci
6363

64-
- uses: actions/setup-node@v4
64+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
6565
with:
6666
node-version-file: ".nvmrc"
6767

@@ -93,13 +93,13 @@ jobs:
9393
rm -rf venv
9494
shell: bash
9595
96-
- uses: infotroph/tree-is-clean@v1
96+
- uses: infotroph/tree-is-clean@69d598a958e8cb8f3d0e3d52b5ebcd8684f2adc2 # v1
9797
with:
9898
check_untracked: true
9999

100100
- name: Configure AWS Credentials
101101
if: vars.OIDC_AWS_ROLE_TO_ASSUME
102-
uses: aws-actions/configure-aws-credentials@v4
102+
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4
103103
with:
104104
aws-region: us-west-2
105105
role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
@@ -157,7 +157,7 @@ jobs:
157157
158158
- name: Create artifact for benchmark APKs
159159
if: matrix.renderer == 'opengl'
160-
uses: actions/upload-artifact@v4
160+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
161161
with:
162162
if-no-files-found: error
163163
name: benchmarkAPKs
@@ -184,7 +184,7 @@ jobs:
184184
cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/${{ matrix.renderer }}/debug/MapLibreAndroidTestApp-${{ matrix.renderer }}-debug-androidTest.apk InstrumentationTests${{ env.renderer }}.apk
185185
186186
- name: Upload android-ui-test-${{ matrix.renderer }}
187-
uses: actions/upload-artifact@v4
187+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
188188
with:
189189
if-no-files-found: error
190190
name: android-ui-test-${{ matrix.renderer }}
@@ -207,7 +207,7 @@ jobs:
207207
working-directory: test/android
208208

209209
steps:
210-
- uses: actions/checkout@v4
210+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
211211
with:
212212
submodules: recursive
213213
fetch-depth: 0
@@ -220,7 +220,7 @@ jobs:
220220

221221
- name: Configure AWS Credentials
222222
if: vars.OIDC_AWS_ROLE_TO_ASSUME
223-
uses: aws-actions/configure-aws-credentials@v4
223+
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4
224224
with:
225225
aws-region: us-west-2
226226
role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
@@ -243,7 +243,7 @@ jobs:
243243
cp app/build/outputs/apk/androidTest/release/app-release-androidTest.apk .
244244
245245
- name: Store C++ Unit Tests .apk files
246-
uses: actions/upload-artifact@v4
246+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
247247
with:
248248
name: android-cpp-tests
249249
if-no-files-found: error
@@ -265,7 +265,7 @@ jobs:
265265
if: needs.pre_job.outputs.should_skip != 'true'
266266

267267
steps:
268-
- uses: actions/checkout@v4
268+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
269269
with:
270270
submodules: recursive
271271
fetch-depth: 0
@@ -274,7 +274,7 @@ jobs:
274274

275275
- name: Configure AWS Credentials
276276
if: vars.OIDC_AWS_ROLE_TO_ASSUME
277-
uses: aws-actions/configure-aws-credentials@v4
277+
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4
278278
with:
279279
aws-region: us-west-2
280280
role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
@@ -314,13 +314,13 @@ jobs:
314314

315315
# automatically trigger android-release when code is pushed to main
316316
# and the platform/android/VERSION file has changed
317-
- uses: actions/checkout@v4
317+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
318318
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
319319

320320
- name: VERSION file changed
321321
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
322322
id: version-file-android-changed
323-
uses: tj-actions/changed-files@v46
323+
uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46
324324
with:
325325
files: platform/android/VERSION
326326

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ jobs:
7878
runs-on: ubuntu-latest
7979
if: github.repository_owner == 'maplibre' && github.event.workflow_run.conclusion == 'success'
8080
steps:
81-
- uses: actions/checkout@v4
81+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
8282

83-
- uses: actions/setup-node@v4
83+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
8484
with:
8585
node-version-file: '.nvmrc'
8686

@@ -100,7 +100,7 @@ jobs:
100100
id: get-pr-number
101101

102102
- name: Generate token
103-
uses: actions/create-github-app-token@v2
103+
uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2
104104
id: generate_token
105105
with:
106106
skip-token-revoke: true # revoking will fail for long running workflows, because the token will already have expired
@@ -109,7 +109,7 @@ jobs:
109109

110110
- name: Check if comment on PR contains '!benchmark android'
111111
if: matrix.test.name == 'Android Benchmark' && steps.get-pr-number.outputs.pr-number
112-
uses: peter-evans/find-comment@v3
112+
uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3
113113
id: benchmark_comment
114114
with:
115115
issue-number: ${{ steps.get-pr-number.outputs.pr-number }}
@@ -126,7 +126,7 @@ jobs:
126126
run:
127127
echo "run_device_test=true" >> "$GITHUB_ENV"
128128

129-
- uses: LouisBrunner/[email protected]
129+
- uses: LouisBrunner/checks-action@6b626ffbad7cc56fd58627f774b9067e6118af23 # v2.0.0
130130
id: create_check
131131
with:
132132
token: ${{ steps.generate_token.outputs.token }}
@@ -143,7 +143,7 @@ jobs:
143143

144144
- name: Configure AWS Credentials
145145
if: env.run_device_test == 'true'
146-
uses: aws-actions/configure-aws-credentials@v4
146+
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4
147147
with:
148148
aws-region: us-west-2
149149
role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
@@ -196,20 +196,20 @@ jobs:
196196
197197
- name: Upload Test Artifacts
198198
if: (matrix.test.name == 'Android Benchmark' || failure()) && env.run_device_test == 'true'
199-
uses: actions/upload-artifact@v4
199+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
200200
with:
201201
name: "Test Artifacts ${{ matrix.test.name }}"
202202
path: test_artifacts.zip
203203

204204
- name: Generate another token (previous one could have expired)
205205
if: always()
206-
uses: actions/create-github-app-token@v2
206+
uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2
207207
id: generate_token_2
208208
with:
209209
app-id: ${{ secrets.MAPLIBRE_NATIVE_BOT_APP_ID }}
210210
private-key: ${{ secrets.MAPLIBRE_NATIVE_BOT_PRIVATE_KEY }}
211211

212-
- uses: LouisBrunner/[email protected]
212+
- uses: LouisBrunner/checks-action@6b626ffbad7cc56fd58627f774b9067e6118af23 # v2.0.0
213213
if: always()
214214
with:
215215
token: ${{ steps.generate_token_2.outputs.token }}

.github/workflows/android-release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
run:
1414
working-directory: platform/android
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
1717

1818
- name: Validate and set version
1919
working-directory: .
@@ -50,7 +50,7 @@ jobs:
5050

5151
- name: Create release
5252
id: create_release
53-
uses: actions/create-release@v1
53+
uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1
5454
env:
5555
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5656
with:
@@ -78,16 +78,16 @@ jobs:
7878
- Release
7979
- Debug
8080
steps:
81-
- uses: actions/checkout@v4
81+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
8282
with:
8383
submodules: recursive
8484
fetch-depth: 0
8585

86-
- uses: actions/setup-node@v4
86+
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
8787
with:
8888
node-version-file: ".nvmrc"
8989

90-
- uses: actions/setup-java@v4
90+
- uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
9191
with:
9292
distribution: "temurin"
9393
java-version: "17"
@@ -108,7 +108,7 @@ jobs:
108108
echo buildtype=${buildtype,,} > "$GITHUB_ENV"
109109
110110
- name: Upload aar (${{ matrix.RENDERER }}, ${{ matrix.BUILDTYPE }})
111-
uses: actions/upload-release-asset@v1
111+
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1
112112
env:
113113
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
114114
with:
@@ -118,7 +118,7 @@ jobs:
118118
asset_content_type: application/zip
119119

120120
- name: Upload debug symbols (${{ matrix.RENDERER }}, ${{ matrix.BUILDTYPE }})
121-
uses: actions/upload-release-asset@v1
121+
uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1
122122
env:
123123
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
124124
with:

.github/workflows/android-testapp-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
create-android-testapp-release:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
1414

1515
- name: Create Release
1616
run: |
@@ -41,7 +41,7 @@ jobs:
4141
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
4242
SENTRY_DSN: ${{ secrets.SENTRY_DSN_ANDROID }}
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
4545
with:
4646
submodules: recursive
4747
fetch-depth: 0

.github/workflows/cache-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
contents: read
1616
steps:
1717
- name: Check out code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
1919

2020
- name: Cleanup
2121
run: |

0 commit comments

Comments
 (0)