From 2b000422d03c6ee0f7542d73ea789c94c459b98f Mon Sep 17 00:00:00 2001 From: Yixue Wang Date: Mon, 16 Jun 2025 15:23:03 +0800 Subject: [PATCH 1/3] feat: Support VERSION file Use VERSION file to manage DTK version. VERSION file defines package version. It also decides the initial value of cached variable DTK_VERSION which controls the project version in cmake build system. VERSION file is not synchronized to DTK6, as DTK6 has its own VERSION file. One can still pass version to DTK_VERSION when running cmake configure. This is helpful for developers. Signed-off-by: Yixue Wang --- .reuse/dep5 | 2 +- .syncexclude | 1 + CMakeLists.txt | 7 +++---- VERSION | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 VERSION diff --git a/.reuse/dep5 b/.reuse/dep5 index 232da69d..2b3911e8 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -4,7 +4,7 @@ Upstream-Contact: UnionTech Software Technology Co.,Ltd. <> Source: https://github.com/linuxdeepin/qt5platform-plugins # Config files -Files: .gitignore clog.toml .clog.toml .gitlab-ci.yml .project qt5platform-plugins.pro CHANGELOG.md misc/*.xml src/*.pri +Files: .gitignore clog.toml .clog.toml .gitlab-ci.yml .project qt5platform-plugins.pro CHANGELOG.md misc/*.xml src/*.pri VERSION Copyright: None License: CC0-1.0 diff --git a/.syncexclude b/.syncexclude index dd2fb19d..8d09991a 100644 --- a/.syncexclude +++ b/.syncexclude @@ -8,3 +8,4 @@ # * .github # are always ignored linglong.yaml +VERSION diff --git a/CMakeLists.txt b/CMakeLists.txt index 3eaba714..9ed9d3dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,10 +4,9 @@ cmake_minimum_required(VERSION 3.13) -set(DTK_VERSION - "5.6.8" - CACHE STRING "define project version" -) +file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" DTK_FILE_VERSION) +string(STRIP "${DTK_FILE_VERSION}" DTK_FILE_VERSION) +set(DTK_VERSION "${DTK_FILE_VERSION}" CACHE STRING "define project version") project(qt5platform-plugins VERSION ${DTK_VERSION} diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..e8406ce3 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +5.7.16 From be71ab3abebc676a454ae9d398bea406a7d02430 Mon Sep 17 00:00:00 2001 From: Yixue Wang Date: Mon, 16 Jun 2025 15:24:32 +0800 Subject: [PATCH 2/3] feat(ci): Add auto release workflow Signed-off-by: Yixue Wang --- .github/workflows/call-auto-release.yml | 50 +++++++++++++++++++++++++ .reuse/dep5 | 2 +- VERSION.in | 1 + 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/call-auto-release.yml create mode 100644 VERSION.in diff --git a/.github/workflows/call-auto-release.yml b/.github/workflows/call-auto-release.yml new file mode 100644 index 00000000..2908c9b9 --- /dev/null +++ b/.github/workflows/call-auto-release.yml @@ -0,0 +1,50 @@ +name: Auto Release +on: + workflow_dispatch: + inputs: + version: + description: 'Release version (e.g., 1.0.0)' + type: string + required: true + name: + description: 'The name of the person to release the version' + type: string + required: false + email: + description: 'The email of the person to release the version' + type: string + required: false + timezone: + description: 'The timezone in the debian changelog file' + required: false + type: string + default: 'Asia/Shanghai' + workflow_call: + inputs: + version: + description: 'Release version (e.g., 1.0.0)' + type: string + required: true + name: + description: 'The name of the person to release the version' + type: string + required: false + email: + description: 'The email of the person to release the version' + type: string + required: false + timezone: + description: 'The timezone in the debian changelog file' + required: false + type: string + default: 'Asia/Shanghai' + +jobs: + auto_release: + uses: linuxdeepin/.github/.github/workflows/auto-release.yml@master + secrets: inherit + with: + version: ${{ inputs.version }} + name: ${{ inputs.name }} + email: ${{ inputs.email }} + timezone: ${{ inputs.timezone }} diff --git a/.reuse/dep5 b/.reuse/dep5 index 2b3911e8..44c222ee 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -19,7 +19,7 @@ Copyright: None License: CC0-1.0 # ci -Files: .github/* .obs/workflows.yml linglong.yaml .syncexclude +Files: .github/* .obs/workflows.yml linglong.yaml .syncexclude VERSION.in Copyright: None License: CC0-1.0 diff --git a/VERSION.in b/VERSION.in new file mode 100644 index 00000000..14d2ff63 --- /dev/null +++ b/VERSION.in @@ -0,0 +1 @@ +@version@ From 5cf0b02c0aae0de489d17a336c59c3580d23d355 Mon Sep 17 00:00:00 2001 From: Yixue Wang Date: Mon, 16 Jun 2025 15:27:21 +0800 Subject: [PATCH 3/3] chore: remove unused linglong.yaml Linglong do not use this now. Signed-off-by: Yixue Wang --- .reuse/dep5 | 2 +- .syncexclude | 1 - linglong.yaml | 28 ---------------------------- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 linglong.yaml diff --git a/.reuse/dep5 b/.reuse/dep5 index 44c222ee..4ffdc3e0 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -19,7 +19,7 @@ Copyright: None License: CC0-1.0 # ci -Files: .github/* .obs/workflows.yml linglong.yaml .syncexclude VERSION.in +Files: .github/* .obs/workflows.yml .syncexclude VERSION.in Copyright: None License: CC0-1.0 diff --git a/.syncexclude b/.syncexclude index 8d09991a..023f1c55 100644 --- a/.syncexclude +++ b/.syncexclude @@ -7,5 +7,4 @@ # * .obs # * .github # are always ignored -linglong.yaml VERSION diff --git a/linglong.yaml b/linglong.yaml deleted file mode 100644 index eb23d659..00000000 --- a/linglong.yaml +++ /dev/null @@ -1,28 +0,0 @@ -package: - id: qt5platform-plugins - name: qt5platform-plugins - kind: lib - version: 5.6.3 - description: | - Qt platform plugins for DDE. - -base: - id: org.deepin.base/23.0.0 - -depends: - - id: qtbase/5.15.7 - - id: qttools/5.15.7 - - id: qtx11extras/5.15.7 - - id: qtsvg/5.15.7 - - id: qtmultimedia/5.15.7 - - id: qtwayland/5.15.7 - - id: dwayland/5.24.3.1 - - id: gsettings-qt/0.3.1 - #- id: googletest/1.8.1 - -source: - kind: local - -build: - kind: qmake -