Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
if: contains(github.event.head_commit.message, 'deploy+') || contains(github.event.head_commit.message, 'pkg+')
strategy:
matrix:
platform: [ "ubuntu-latest", "ubuntu-24.04-arm" ]
# container: [ "ubuntu:18.04", "ubuntu:20.04", "ubuntu:22.04", "ubuntu:23.04", "debian:11", "fedora:37", "fedora:38", "archlinux:latest" ]
container: [ "ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04", "debian:11", "debian:12", "fedora:40", "fedora:41", "opensuse/tumbleweed" ]
# this list should be updated from time to time by consulting these pages:
Expand All @@ -22,9 +23,11 @@ jobs:
exclude:
- container: "ubuntu:20.04"
ime: "fcitx"
runs-on: "ubuntu-latest"
- platform: "ubuntu-24.04-arm"
container: "opensuse/tumbleweed"
runs-on: ${{ matrix.platform }}
container:
image: ${{ matrix.container }}
image: ${{ matrix.platform == 'ubuntu-24.04-arm' && format('arm64v8/{0}', matrix.container) || matrix.container }}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to specify arm64v8 explicitly? Isn't it the default that if the host platform is arm64 the docker images will be automatically arm64 based?

env:
DIST: ${{ matrix.container }}
IME: ${{ matrix.ime }}
Expand Down Expand Up @@ -64,7 +67,7 @@ jobs:
- name: upload-artifacts
uses: actions/upload-artifact@v4
with:
name: pkg-${{ steps.sanitizer.outputs.sanitized_container }}-${{ matrix.ime }}
name: pkg-${{ matrix.platform == 'ubuntu-24.04-arm' && 'arm64' || 'x64' }}-${{ steps.sanitizer.outputs.sanitized_container }}-${{ matrix.ime }}
path: artifact

release:
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/applications" "/us
"/usr/share/icons/hicolor/32x32" "/usr/share/icons/hicolor/32x32/apps"
"/usr/share/icons/hicolor/48x48" "/usr/share/icons/hicolor/48x48/apps"
"/usr/share/icons/hicolor/512x512" "/usr/share/icons/hicolor/512x512/apps")
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${PROJECT_VERSION}-$ENV{DIST}")
# Configure CPack on the basis of which backend we are building for.
if(ENABLE_IBUS)
## IBUS
Expand Down Expand Up @@ -183,4 +182,7 @@ elseif(APPLE)
set(CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA_ALIGNMENT "left")
endif()

# Set package filename after CPACK_PACKAGE_NAME is defined
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${PROJECT_VERSION}-$ENV{DIST}")

include(CPack)
8 changes: 6 additions & 2 deletions src/frontend/TopBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -379,12 +379,16 @@ bool TopBar::eventFilter(QObject *object, QEvent *event) {
// Mouse release event was missed; stop dragging.
canMoveTopbar = false;
ui->buttonIcon->setCursor(Qt::ArrowCursor);
} else if(this->windowHandle()->startSystemMove()){
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We now hard depend on Qt 5.15, so lets remove this check and remove the builders that don't have 5.15

else if(this->windowHandle()->startSystemMove()){
// The window manager now owns the drag and will consume the
// mouse release event, so reset our drag state immediately.
canMoveTopbar = false;
ui->buttonIcon->setCursor(Qt::ArrowCursor);
} else {
}
#endif
else {
ui->buttonIcon->setCursor(Qt::ClosedHandCursor);
move(e->globalX() - pressedMouseX, e->globalY() - pressedMouseY);
}
Expand Down