diff --git a/.github/scripts/ensure-tag.sh b/.github/scripts/ensure-tag.sh index 47a424072..e8e64f4a9 100755 --- a/.github/scripts/ensure-tag.sh +++ b/.github/scripts/ensure-tag.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + if [ $# -lt 1 ] || [ $# -gt 2 ]; then echo "Usage: $0 []" echo " Git tag name to create or verify" diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 47f247317..722991bcd 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -346,6 +346,8 @@ jobs: - name: Create tag if it does not exist if: env.make_release == 'true' run: .github/scripts/ensure-tag.sh android-v${{ env.version }} ${{ github.sha }} + env: + GITHUB_TOKEN: ${{ github.token }} - name: Trigger release if: env.make_release == 'true' diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 6f0dec970..037104c49 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -137,10 +137,10 @@ jobs: run: | renderer=${{ matrix.RENDERER }} if [ "$renderer" = "opengl" ]; then - ./gradlew :MapLibreAndroid:publishOpengl${{ env.buildtype }}PublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository - ./gradlew :MapLibreAndroid:publishDefault${{ env.buildtype }}PublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository + ./gradlew :MapLibreAndroid:publishOpengl${{ env.buildtype }}PublicationToSonatypeRepository + ./gradlew :MapLibreAndroid:publishDefault${{ env.buildtype }}PublicationToSonatypeRepository else - ./gradlew :MapLibreAndroid:publishVulkan${{ env.buildtype }}PublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository + ./gradlew :MapLibreAndroid:publishVulkan${{ env.buildtype }}PublicationToSonatypeRepository fi env: MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} @@ -164,6 +164,19 @@ jobs: - 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 working-directory: . diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index 2cea21abd..9524cb2f6 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog MapLibre Native for Android -## 11.13.3 +## 11.13.4 ### ✨ Features and improvements diff --git a/platform/android/VERSION b/platform/android/VERSION index 32f0b5a51..ceba548de 100644 --- a/platform/android/VERSION +++ b/platform/android/VERSION @@ -1 +1 @@ -11.13.3 +11.13.4