Android Release Workflow Fixes (#3813)

This commit is contained in:
Bart Louwers
2025-09-17 19:50:46 +00:00
committed by GitHub
parent 60ac709e95
commit 9b7717c4a8
5 changed files with 22 additions and 5 deletions

View File

@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
set -e
if [ $# -lt 1 ] || [ $# -gt 2 ]; then if [ $# -lt 1 ] || [ $# -gt 2 ]; then
echo "Usage: $0 <tag> [<commit-sha>]" echo "Usage: $0 <tag> [<commit-sha>]"
echo " <tag> Git tag name to create or verify" echo " <tag> Git tag name to create or verify"

View File

@@ -346,6 +346,8 @@ jobs:
- name: Create tag if it does not exist - name: Create tag if it does not exist
if: env.make_release == 'true' if: env.make_release == 'true'
run: .github/scripts/ensure-tag.sh android-v${{ env.version }} ${{ github.sha }} run: .github/scripts/ensure-tag.sh android-v${{ env.version }} ${{ github.sha }}
env:
GITHUB_TOKEN: ${{ github.token }}
- name: Trigger release - name: Trigger release
if: env.make_release == 'true' if: env.make_release == 'true'

View File

@@ -137,10 +137,10 @@ jobs:
run: | run: |
renderer=${{ matrix.RENDERER }} renderer=${{ matrix.RENDERER }}
if [ "$renderer" = "opengl" ]; then if [ "$renderer" = "opengl" ]; then
./gradlew :MapLibreAndroid:publishOpengl${{ env.buildtype }}PublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository ./gradlew :MapLibreAndroid:publishOpengl${{ env.buildtype }}PublicationToSonatypeRepository
./gradlew :MapLibreAndroid:publishDefault${{ env.buildtype }}PublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository ./gradlew :MapLibreAndroid:publishDefault${{ env.buildtype }}PublicationToSonatypeRepository
else else
./gradlew :MapLibreAndroid:publishVulkan${{ env.buildtype }}PublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository ./gradlew :MapLibreAndroid:publishVulkan${{ env.buildtype }}PublicationToSonatypeRepository
fi fi
env: env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
@@ -164,6 +164,19 @@ jobs:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4 - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v4
with:
distribution: "temurin"
java-version: "17"
- name: Close Sonatype staging repository
run: ./gradlew closeSonatypeStagingRepository
working-directory: platform/android
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
- run: npm install - run: npm install
working-directory: . working-directory: .

View File

@@ -1,6 +1,6 @@
# Changelog MapLibre Native for Android # Changelog MapLibre Native for Android
## 11.13.3 ## 11.13.4
### ✨ Features and improvements ### ✨ Features and improvements

View File

@@ -1 +1 @@
11.13.3 11.13.4