CI: Migrate away from actions/create-release

mapeditor · Oct 18, 2024 · 2177a6e · 2177a6e
1 parent 5055d9a
commit 2177a6e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 59 deletions.
diff --git 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="80" height="31" tilewidth="32" tileheight="32" infinite="0" backgroundcolor="#35495e" nextlayerid="9" nextobjectid="387">
+<map version="1.11" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="80" height="31" tilewidth="32" tileheight="32" infinite="0" backgroundcolor="#35495e" nextlayerid="10" nextobjectid="388">
  <tileset firstgid="1" source="objs.tsx"/>
  <objectgroup id="1" name="background">
   <object id="193" gid="6" x="0" y="1184" width="1280" height="416"/>
@@ -260,7 +260,7 @@
   <object id="340" gid="16" x="864" y="600" width="192" height="192"/>
  </objectgroup>
  <objectgroup id="6" name="game">
-  <object id="58" template="templates/hero.tx" x="288" y="448"/>
+  <object id="58" template="templates/hero.tx" gid="2147483670" x="288" y="448"/>
   <object id="111" template="templates/block.tx" x="2245" y="340"/>
   <object id="161" name="hey" type="blob" gid="3" x="464" y="768" width="96" height="64"/>
   <object id="160" type="blob" gid="2" x="846" y="756" width="96" height="64"/>
@@ -269,7 +269,11 @@
   <object id="192" type="coin" gid="17" x="96" y="416" width="64" height="64"/>
   <object id="231" template="templates/block.tx" x="488" y="448"/>
   <object id="285" type="coin" gid="17" x="1536" y="576" width="64" height="64"/>
+  <object id="387" x="240" y="48" width="96" height="21.7969">
+   <text wrap="1" color="#ffffff">Hello World</text>
+  </object>
  </objectgroup>
+ <imagelayer id="9" name="Bildebene 1"/>
  <objectgroup id="7" name="above">
   <object id="379" type="spikes" gid="51" x="1280" y="995" width="128" height="32"/>
   <object id="380" type="spikes" gid="51" x="1408" y="995" width="128" height="32"/>