Skip to content

Commit 51e3eed

Browse files
author
“Malcolm
committed
Revert "Merge branch 'feature/2025-08-plugins' into maplibre/feature/2025-08-plugins"
This reverts commit c524f29, reversing changes made to 7f96a34.
1 parent c524f29 commit 51e3eed

File tree

211 files changed

+1040
-11955
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

+1040
-11955
lines changed

.github/workflows/android-ci.yml

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

15-
permissions:
16-
contents: write
17-
actions: write
18-
1915
concurrency:
2016
# cancel jobs on PRs only
2117
group: ${{ github.workflow }}-${{ github.ref }}
@@ -34,7 +30,7 @@ jobs:
3430
- name: Get all Android files that have changed
3531
if: github.event_name != 'workflow_dispatch'
3632
id: changed-files
37-
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1
33+
uses: tj-actions/changed-files@v46
3834
with:
3935
files_yaml_from_source_file: .github/changed-files.yml
4036

@@ -356,7 +352,7 @@ jobs:
356352
- name: VERSION file changed
357353
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
358354
id: version-file-android-changed
359-
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1
355+
uses: tj-actions/changed-files@v46
360356
with:
361357
files: platform/android/VERSION
362358

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

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

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

69
permissions:
710
id-token: write # needed for AWS

.github/workflows/android-release.yml

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

6-
permissions:
7-
contents: write
8-
96
jobs:
107
android-create-release:
118
runs-on: ubuntu-24.04
@@ -55,7 +52,7 @@ jobs:
5552
id: create_release
5653
uses: actions/create-release@v1
5754
env:
58-
GITHUB_TOKEN: ${{ secrets.MAPLIBRE_NATIVE_PRIVATE_TOKEN }}
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5956
with:
6057
tag_name: ${{ steps.prepare_release.outputs.version_tag }}
6158
release_name: ${{steps.prepare_release.outputs.version_tag }}
@@ -65,7 +62,7 @@ jobs:
6562

6663
android-build-and-upload-release:
6764
needs: android-create-release
68-
runs-on: ubuntu-24.04
65+
runs-on: MapLibre_Native_Ubuntu_24_04_x84_16_core
6966
defaults:
7067
run:
7168
working-directory: platform/android
@@ -136,23 +133,35 @@ jobs:
136133
asset_name: debug-symbols-maplibre-android-${{ matrix.RENDERER }}-${{ env.buildtype }}-${{ needs.android-create-release.outputs.version_tag }}.tar.gz
137134
asset_content_type: application/gzip
138135

139-
- name: Publish to Github
136+
- name: Prepare MavenCentral release
140137
env:
141-
GITHUB_TOKEN: ${{ secrets.MAPLIBRE_NATIVE_PRIVATE_TOKEN }}
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
142144
run: |
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
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 }}
149158

150159
- run: npm install
151160
working-directory: .
152161

153162
- name: Write release notifications
154163
if: github.repository_owner == 'maplibre'
155164
env:
156-
GITHUB_TOKEN: ${{ secrets.MAPLIBRE_NATIVE_PRIVATE_TOKEN }}
165+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
157166
run: node .github/scripts/notify-release-on-prs.ts --tag ${{ needs.android-create-release.outputs.version_tag }}
158167
working-directory: .

0 commit comments

Comments
 (0)