From 0f3c97b56e01fbeb89697d89709c1c7879de43bb Mon Sep 17 00:00:00 2001 From: HarelM Date: Wed, 20 Nov 2024 22:55:17 +0200 Subject: [PATCH] Remove deprecated actions, simplify release flow --- .github/workflows/create-bumb-version-pr.yml | 2 +- .github/workflows/release.yml | 28 ++------------------ CHANGELOG.md | 4 +-- 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/.github/workflows/create-bumb-version-pr.yml b/.github/workflows/create-bumb-version-pr.yml index 3d4dfd0946..249cb8ef5c 100644 --- a/.github/workflows/create-bumb-version-pr.yml +++ b/.github/workflows/create-bumb-version-pr.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: version: - description: Version to change to. + description: Version to change to (semver). required: true type: string diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69201210cd..5075ee75c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -96,13 +96,12 @@ jobs: - name: Build Release Notes id: release_notes - if: ${{ steps.prepare_release.outputs.release_type == 'regular' }} run: | RELEASE_NOTES_PATH="${PWD}/release_notes.txt" ./build/release-notes.js > ${RELEASE_NOTES_PATH} echo "release_notes=${RELEASE_NOTES_PATH}" >> $GITHUB_OUTPUT - - name: Create GitHub Release (regular) + - name: Create GitHub Release id: create_regular_release if: ${{ steps.prepare_release.outputs.release_type == 'regular' }} uses: ncipollo/release-action@v1 @@ -116,30 +115,7 @@ jobs: artifactContentType: "application/zip" allowUpdates: true draft: false - prerelease: false - - - name: Create GitHub Release (prerelease) - id: create_prerelease - if: ${{ steps.prepare_release.outputs.release_type == 'prerelease' }} - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ steps.tag_version.outputs.new_tag }} - release_name: ${{ steps.tag_version.outputs.new_tag }} - draft: false - prerelease: true - - - name: Upload GitHub Release Assets (prerelease) - uses: actions/upload-release-asset@v1 - if: ${{ steps.prepare_release.outputs.release_type == 'prerelease' }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_prerelease.outputs.upload_url }} - asset_path: ./dist.zip - asset_name: dist.zip - asset_content_type: application/zip + prerelease: ${{ steps.prepare_release.outputs.release_type == 'prerelease' }} - name: Copy benchmarks_generated.js run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 902382178e..d4bae87f82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,7 @@ ### 🐞 Bug fixes - ⚠️ Fix level of detail at high pitch angle by changing which tiles to load ([#3983](https://github.com/maplibre/maplibre-gl-js/issues/3983)) -- ~~⚠️~~ Fix URL parsing in `normalizeSpriteURL`, sprite URLs must be absolute ([#4962](https://github.com/maplibre/maplibre-gl-js/issues/4962)) +- ~~⚠️ Fix URL parsing in `normalizeSpriteURL`, sprite URLs must be absolute ([#4962](https://github.com/maplibre/maplibre-gl-js/issues/4962))~~ ## 5.0.0-pre.5 @@ -67,7 +67,7 @@ - Fix 3D models in custom layers not being properly occluded by the globe ([#4817](https://github.com/maplibre/maplibre-gl-js/issues/4817)) - Fix issue where raster tiles were not rendered correctly when using globe and terrain ([#4912](https://github.com/maplibre/maplibre-gl-js/pull/4912)) -## v5.0.0-pre.3 +## 5.0.0-pre.3 ### ✨ Features and improvements