Skip to content

Commit c524f29

Browse files
Merge branch 'feature/2025-08-plugins' into maplibre/feature/2025-08-plugins
2 parents 7f96a34 + 35e3ae2 commit c524f29

File tree

211 files changed

+11955
-1040
lines changed

Some content is hidden

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

211 files changed

+11955
-1040
lines changed

.github/workflows/android-ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ on:
1212
branches:
1313
- "*"
1414

15+
permissions:
16+
contents: write
17+
actions: write
18+
1519
concurrency:
1620
# cancel jobs on PRs only
1721
group: ${{ github.workflow }}-${{ github.ref }}
@@ -30,7 +34,7 @@ jobs:
3034
- name: Get all Android files that have changed
3135
if: github.event_name != 'workflow_dispatch'
3236
id: changed-files
33-
uses: tj-actions/changed-files@v46
37+
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1
3438
with:
3539
files_yaml_from_source_file: .github/changed-files.yml
3640

@@ -352,7 +356,7 @@ jobs:
352356
- name: VERSION file changed
353357
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
354358
id: version-file-android-changed
355-
uses: tj-actions/changed-files@v46
359+
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1
356360
with:
357361
files: platform/android/VERSION
358362

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: android-device-test
22

33
on:
4-
workflow_run:
5-
workflows: [android-ci]
6-
types:
7-
- completed
4+
workflow_dispatch:
85

96
permissions:
107
id-token: write # needed for AWS

.github/workflows/android-release.yml

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: android-release
33
on:
44
workflow_dispatch:
55

6+
permissions:
7+
contents: write
8+
69
jobs:
710
android-create-release:
811
runs-on: ubuntu-24.04
@@ -52,7 +55,7 @@ jobs:
5255
id: create_release
5356
uses: actions/create-release@v1
5457
env:
55-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58+
GITHUB_TOKEN: ${{ secrets.MAPLIBRE_NATIVE_PRIVATE_TOKEN }}
5659
with:
5760
tag_name: ${{ steps.prepare_release.outputs.version_tag }}
5861
release_name: ${{steps.prepare_release.outputs.version_tag }}
@@ -62,7 +65,7 @@ jobs:
6265

6366
android-build-and-upload-release:
6467
needs: android-create-release
65-
runs-on: MapLibre_Native_Ubuntu_24_04_x84_16_core
68+
runs-on: ubuntu-24.04
6669
defaults:
6770
run:
6871
working-directory: platform/android
@@ -133,35 +136,23 @@ jobs:
133136
asset_name: debug-symbols-maplibre-android-${{ matrix.RENDERER }}-${{ env.buildtype }}-${{ needs.android-create-release.outputs.version_tag }}.tar.gz
134137
asset_content_type: application/gzip
135138

136-
- name: Prepare MavenCentral release
139+
- name: Publish to Github
137140
env:
138-
GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}
139-
run: |
140-
echo "${GPG_KEY_CONTENTS}" | base64 -d > signing-key.gpg
141-
shell: bash
142-
143-
- name: Publish to MavenCentral
141+
GITHUB_TOKEN: ${{ secrets.MAPLIBRE_NATIVE_PRIVATE_TOKEN }}
144142
run: |
145-
renderer=${{ matrix.RENDERER }}
146-
if [ "$renderer" = "opengl" ]; then
147-
./gradlew :MapLibreAndroid:publishOpengl${{ env.buildtype }}PublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository
148-
./gradlew :MapLibreAndroid:publishDefault${{ env.buildtype }}PublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository
149-
else
150-
./gradlew :MapLibreAndroid:publishVulkan${{ env.buildtype }}PublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository
151-
fi
152-
env:
153-
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
154-
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
155-
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
156-
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
157-
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
143+
renderer=${{ matrix.RENDERER }}
144+
if [ "$renderer" = "opengl" ]; then
145+
./gradlew :MapLibreAndroid:publishDefault${{ env.buildtype }}PublicationToGithubPackagesRepository
146+
else
147+
./gradlew :MapLibreAndroid:publishVulkan${{ env.buildtype }}PublicationToGithubPackagesRepository
148+
fi
158149
159150
- run: npm install
160151
working-directory: .
161152

162153
- name: Write release notifications
163154
if: github.repository_owner == 'maplibre'
164155
env:
165-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
156+
GITHUB_TOKEN: ${{ secrets.MAPLIBRE_NATIVE_PRIVATE_TOKEN }}
166157
run: node .github/scripts/notify-release-on-prs.ts --tag ${{ needs.android-create-release.outputs.version_tag }}
167158
working-directory: .

0 commit comments

Comments
 (0)