From 2177a6ea35ea2106a3427579ebeaee2160e54b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Fri, 18 Oct 2024 18:14:57 +0200 Subject: [PATCH] CI: Migrate away from actions/create-release --- .github/workflows/packages.yml | 71 +++++------------------- examples/sticker-knight/map/sandbox2.tmx | 8 ++- 2 files changed, 20 insertions(+), 59 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index a3d4baf99a..256563033d 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -354,72 +354,29 @@ jobs: name: Upload to GitHub releases runs-on: ubuntu-latest needs: [version, linux, macos, windows] + permissions: + contents: write if: github.repository == 'mapeditor/tiled' && github.event_name == 'push' && needs.version.outputs.release == 'true' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: + - name: Download all artifacts + uses: actions/download-artifact@v4 + - name: Create release id: create_release - uses: actions/create-release@v1 + uses: softprops/action-gh-release@v2 with: - tag_name: ${{ github.ref }} - release_name: Tiled ${{ needs.version.outputs.version }} + name: Tiled ${{ needs.version.outputs.version }} draft: true prerelease: false - - - name: Download all artifacts - uses: actions/download-artifact@v4 - - - name: Upload Windows 64-bit installer - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Tiled-win64.msi/Tiled-${{ needs.version.outputs.version }}-win64.msi - asset_name: Tiled-${{ needs.version.outputs.version }}_Windows-10+_x86_64.msi - asset_content_type: application/x-msi - - - name: Upload Windows 32-bit installer - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Tiled-win32.msi/Tiled-${{ needs.version.outputs.version }}-win32.msi - asset_name: Tiled-${{ needs.version.outputs.version }}_Windows-7-8_x86.msi - asset_content_type: application/x-msi - - - name: Upload Linux AppImage (Qt5) - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Tiled-Qt5-x86_64.AppImage/Tiled-Qt5-x86_64.AppImage - asset_name: Tiled-${{ needs.version.outputs.version }}_Linux_Qt-5_x86_64.AppImage - asset_content_type: application/vnd.appimage - - - name: Upload Linux AppImage (Qt6) - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Tiled-Qt6-x86_64.AppImage/Tiled-Qt6-x86_64.AppImage - asset_name: Tiled-${{ needs.version.outputs.version }}_Linux_Qt-6_x86_64.AppImage - asset_content_type: application/vnd.appimage - - - name: Upload macOS app (10.12-10.15) - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Tiled_macOS-10.12-10.15.app/Tiled_macOS-10.12-10.15.zip - asset_name: Tiled-${{ needs.version.outputs.version }}_macOS-10.12-10.15.zip - asset_content_type: application/zip - - - name: Upload macOS app (11+) - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Tiled_macOS-11+.app/Tiled_macOS-11+.zip - asset_name: Tiled-${{ needs.version.outputs.version }}_macOS-11+.zip - asset_content_type: application/zip + files: | + Tiled-win64.msi/Tiled-${{ needs.version.outputs.version }}-win64.msi + Tiled-win32.msi/Tiled-${{ needs.version.outputs.version }}-win32.msi + Tiled-Qt5-x86_64.AppImage/Tiled-Qt5-x86_64.AppImage + Tiled-Qt6-x86_64.AppImage/Tiled-Qt6-x86_64.AppImage + Tiled_macOS-10.12-10.15.app/Tiled_macOS-10.12-10.15.zip + Tiled_macOS-11+.app/Tiled_macOS-11+.zip sentry: name: Create Sentry release diff --git a/examples/sticker-knight/map/sandbox2.tmx b/examples/sticker-knight/map/sandbox2.tmx index 61bb0f632b..6a006f8f5c 100644 --- a/examples/sticker-knight/map/sandbox2.tmx +++ b/examples/sticker-knight/map/sandbox2.tmx @@ -1,5 +1,5 @@ - + @@ -260,7 +260,7 @@ - + @@ -269,7 +269,11 @@ + + Hello World + +