Skip to content

Commit

Permalink
Reverted release builds to Qt 5.15.2
Browse files Browse the repository at this point in the history
After finding critical issues in both Qt 6.2.4 and Qt 6.3.1, I'm giving
up for Tiled 1.9. Many could be worked around, but there is no time left
now.
  • Loading branch information
bjorn committed Jun 25, 2022
1 parent c55e5c1 commit 2e9a0fb
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 40 deletions.
59 changes: 22 additions & 37 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ jobs:
qt_version_major: 5
qt_creator_version: 5.0.3
gcc_version: 9
- image: ubuntu-20.04
qt_version: 6.3.1
qt_version_major: 6
qt_creator_version: 7.0.2
gcc_version: 10

env:
TILED_VERSION: ${{ needs.version.outputs.version }}
Expand Down Expand Up @@ -173,18 +168,18 @@ jobs:
release: ${{ steps.version.outputs.snap_channel }}

macos:
name: macOS (Qt ${{ matrix.qt_version_major }})
name: macOS (${{ matrix.version_suffix }})
runs-on: macos-latest
needs: version

strategy:
matrix:
include:
- qt_version: 5.12.12
qt_version_major: 5
version_suffix: "10.12"
qt_creator_version: 5.0.3
- qt_version: 6.3.1
qt_version_major: 6
- qt_version: 5.15.2
version_suffix: "10.13+"
qt_creator_version: 7.0.2

env:
Expand Down Expand Up @@ -252,38 +247,36 @@ jobs:

- name: Create Archive
run: |
ditto -c -k --sequesterRsrc --keepParent install/Tiled.app Tiled-Qt${{ matrix.qt_version_major }}-macos.zip
ditto -c -k --sequesterRsrc --keepParent install/Tiled.app Tiled-macOS-${{ matrix.version_suffix }}.zip
- name: Upload Tiled.app
uses: actions/upload-artifact@v2
with:
name: Tiled-Qt${{ matrix.qt_version_major }}-macos.app
path: Tiled-Qt${{ matrix.qt_version_major }}-macos.zip
name: Tiled-macOS-${{ matrix.version_suffix }}.app
path: Tiled-macOS-${{ matrix.version_suffix }}.zip

windows:
name: Windows (${{ matrix.arch }}-bit, Qt ${{ matrix.qt_version_major }})
name: Windows (${{ matrix.arch }}-bit)
runs-on: windows-2019
needs: version

strategy:
matrix:
include:
- qt_version: 5.15.2
qt_version_major: 5
qt_toolchain: win32_mingw81
arch: 32
openssl_arch: x86
mingw_version: 8.1.0
mingw_component: mingw
mingw_path: /c/Qt/Tools/mingw810_32/bin
- qt_version: 6.3.1
qt_version_major: 6
qt_toolchain: win64_mingw
- qt_version: 5.15.2
qt_toolchain: win64_mingw81
arch: 64
openssl_arch: x64
mingw_version: 9.0.0
mingw_component: mingw90
mingw_path: /c/Qt/Tools/mingw1120_64/bin
mingw_version: 8.1.0
mingw_component: mingw
mingw_path: /c/Qt/Tools/mingw810_64/bin

env:
TILED_VERSION: ${{ needs.version.outputs.version }}
Expand Down Expand Up @@ -368,47 +361,39 @@ jobs:
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_name: Tiled-${{ needs.version.outputs.version }}_Windows_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_name: Tiled-${{ needs.version.outputs.version }}_Windows_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_name: Tiled-${{ needs.version.outputs.version }}_Linux_x86_64.AppImage
asset_content_type: application/vnd.appimage

- name: Upload macOS app (Qt5)
- name: Upload macOS app (10.12)
uses: actions/upload-release-asset@v1
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: Tiled-Qt5-macos.app/Tiled-Qt5-macos.zip
asset_name: Tiled-${{ needs.version.outputs.version }}_macOS-10.12-10.13.zip
asset_path: Tiled-macos-10.12.app/Tiled-macos-10.12.zip
asset_name: Tiled-${{ needs.version.outputs.version }}_macOS-10.12.zip
asset_content_type: application/zip

- name: Upload macOS app (Qt6)
- name: Upload macOS app (10.13+)
uses: actions/upload-release-asset@v1
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: Tiled-Qt6-macos.app/Tiled-Qt6-macos.zip
asset_name: Tiled-${{ needs.version.outputs.version }}_macOS-10.14+.zip
asset_path: Tiled-macos-10.13+.app/Tiled-macos-10.13+.zip
asset_name: Tiled-${{ needs.version.outputs.version }}_macOS-10.13+.zip
asset_content_type: application/zip

sentry:
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ environment:
DEFAULT_PROFILE: MSVC2019-x64
PUSH_RELEASE: false
ENABLE_ZSTD: false
- QTDIR: C:\Qt\6.3\mingw_64
- QTDIR: C:\Qt\5.15\mingw81_64
PYTHONHOME: C:\Python38-x64
MINGW: C:\Qt\Tools\mingw1120_64
DEFAULT_PROFILE: x86_64-w64-mingw32-gcc-11_2_0
MINGW: C:\Qt\Tools\mingw810_64
DEFAULT_PROFILE: x86_64-w64-mingw32-gcc-8_1_0
PUSH_RELEASE: true
ENABLE_ZSTD: true
TILED_ITCH_CHANNEL: windows-64bit
Expand Down

0 comments on commit 2e9a0fb

Please sign in to comment.