diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 16340640d..d7b1f7e68 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -294,6 +294,9 @@ jobs: android-ci-result: runs-on: ubuntu-latest + permissions: + actions: write + contents: read if: needs.pre_job.outputs.should_skip != 'true' && always() needs: - pre_job @@ -338,4 +341,4 @@ jobs: if: env.make_release == 'true' run: gh workflow run android-release.yml --ref android-v${{ env.version }} env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 2750f866a..6f0dec970 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -3,12 +3,14 @@ name: android-release on: workflow_dispatch: +permissions: + contents: write + jobs: android-create-release: runs-on: ubuntu-24.04 outputs: version_tag: ${{ steps.prepare_release.outputs.version_tag }} - upload_url: ${{ steps.create_release.outputs.upload_url }} defaults: run: working-directory: platform/android @@ -48,14 +50,12 @@ jobs: working-directory: . run: .github/scripts/ensure-tag.sh android-v${{ env.version }} ${{ github.sha }} - - name: Create release + - name: Create release (draft) id: create_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3 with: tag_name: ${{ steps.prepare_release.outputs.version_tag }} - release_name: ${{steps.prepare_release.outputs.version_tag }} + name: ${{ steps.prepare_release.outputs.version_tag }} body_path: ${{ steps.prepare_release.outputs.release_notes }} draft: true prerelease: ${{ env.prerelease }} @@ -106,25 +106,25 @@ jobs: # lowercase echo buildtype=${buildtype,,} > "$GITHUB_ENV" - - name: Upload aar (${{ matrix.RENDERER }}, ${{ matrix.BUILDTYPE }}) - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.android-create-release.outputs.upload_url }} - asset_path: platform/android/MapLibreAndroid/build/outputs/aar/MapLibreAndroid-${{ matrix.RENDERER }}-${{ env.buildtype }}.aar - asset_name: MapLibreAndroid-${{ matrix.RENDERER }}-${{ env.buildtype }}-${{ needs.android-create-release.outputs.version_tag }}.aar - asset_content_type: application/zip + - name: Prepare release asset filenames (include tag) + run: | + version_tag='${{ needs.android-create-release.outputs.version_tag }}' + # AAR + aar_dir='MapLibreAndroid/build/outputs/aar' + mv "$aar_dir/MapLibreAndroid-${{ matrix.RENDERER }}-${{ env.buildtype }}.aar" \ + "$aar_dir/MapLibreAndroid-${{ matrix.RENDERER }}-${{ env.buildtype }}-$version_tag.aar" + # Debug symbols + mv "build/debug-symbols-${{ matrix.RENDERER }}-${{ env.buildtype }}.tar.gz" \ + "build/debug-symbols-maplibre-android-${{ matrix.RENDERER }}-${{ env.buildtype }}-$version_tag.tar.gz" - - name: Upload debug symbols (${{ matrix.RENDERER }}, ${{ matrix.BUILDTYPE }}) - uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Upload release assets (${{ matrix.RENDERER }}, ${{ matrix.BUILDTYPE }}) + uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3 with: - upload_url: ${{ needs.android-create-release.outputs.upload_url }} - asset_path: platform/android/build/debug-symbols-${{ matrix.RENDERER }}-${{ env.buildtype }}.tar.gz - asset_name: debug-symbols-maplibre-android-${{ matrix.RENDERER }}-${{ env.buildtype }}-${{ needs.android-create-release.outputs.version_tag }}.tar.gz - asset_content_type: application/gzip + tag_name: ${{ needs.android-create-release.outputs.version_tag }} + fail_on_unmatched_files: true + files: | + platform/android/MapLibreAndroid/build/outputs/aar/MapLibreAndroid-${{ matrix.RENDERER }}-${{ env.buildtype }}-${{ needs.android-create-release.outputs.version_tag }}.aar + platform/android/build/debug-symbols-maplibre-android-${{ matrix.RENDERER }}-${{ env.buildtype }}-${{ needs.android-create-release.outputs.version_tag }}.tar.gz - name: Prepare MavenCentral release env: @@ -149,6 +149,21 @@ jobs: SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + finilize-release: + runs-on: ubuntu-latest + needs: + - android-create-release + - android-build-and-upload-release + steps: + - name: Publish release (remove draft) + uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3 + with: + tag_name: ${{ needs.android-create-release.outputs.version_tag }} + name: ${{ needs.android-create-release.outputs.version_tag }} + draft: false + + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4 + - run: npm install working-directory: . @@ -158,19 +173,3 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: node .github/scripts/notify-release-on-prs.ts --tag ${{ needs.android-create-release.outputs.version_tag }} working-directory: . - - finilize-release: - runs-on: ubuntu-latest - needs: - - android-create-release - - android-build-and-upload-release - steps: - - name: Remove draft status of release - id: create_release - uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - release_name: ${{ needs.android-create-release.outputs.version_tag }} - tag_name: ${{ needs.android-create-release.outputs.version_tag }} - draft: false diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index eed739eb5..2cea21abd 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog MapLibre Native for Android -## 11.13.2 +## 11.13.3 ### ✨ Features and improvements diff --git a/platform/android/VERSION b/platform/android/VERSION index ea601d579..32f0b5a51 100644 --- a/platform/android/VERSION +++ b/platform/android/VERSION @@ -1 +1 @@ -11.13.2 +11.13.3