From 4b5cff8780bf09218baeeac63a94b136969fa631 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 18:21:04 +0800 Subject: [PATCH 01/24] build.yml --- .github/workflows/build.yml | 63 ++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e120929..1e4273a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,27 +1,68 @@ name: Qt CI +name: Build Qt Application on: push: - branches: [ master ] pull_request: - branches: [ master ] + workflow_dispatch: jobs: build: - - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + qt_version: ['5.15.2'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install libusb + if: runner.os == 'Linux' run: | sudo apt update sudo apt install libusb-1.0-0-dev - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v4 with: - modules: qtwebengine - - name: qmake - run: qmake qserial.pro - - name: make - run: make + version: ${{ matrix.qt_version }} + host: ${{ matrix.os }} + target: desktop + arch: x64 + + - name: Build on ${{ matrix.os }} + shell: bash + run: | + mkdir build + cd build + qmake ../qserial.pro + if [[ "${{ runner.os }}" == "Windows" ]]; then + nmake || jom + else + make -j$(nproc) + fi + + - name: Upload Artifacts + uses: actions/upload-artifact@v4 + with: + name: qserial-${{ matrix.os }} + path: | + build/*.exe + build/qserial + build/*.app + if-no-files-found: error + + release: + if: startsWith(github.ref, 'refs/tags/') + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/download-artifact@v4 + with: + path: artifacts + + - name: Create Release + uses: softprops/action-gh-release@v2 + with: + files: artifacts/**/* + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0efa7a2ca92875560c4ba90a194c531db381d855 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 18:25:01 +0800 Subject: [PATCH 02/24] fix syntax --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e4273a..baa6a56 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,4 @@ name: Qt CI -name: Build Qt Application on: push: From 523f4201c29a3dc375258d70d04eb82f3f840faa Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 18:32:25 +0800 Subject: [PATCH 03/24] change host --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index baa6a56..d3c109d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-2019, macos-15] qt_version: ['5.15.2'] steps: @@ -24,8 +24,6 @@ jobs: uses: jurplel/install-qt-action@v4 with: version: ${{ matrix.qt_version }} - host: ${{ matrix.os }} - target: desktop arch: x64 - name: Build on ${{ matrix.os }} From 329209b8dd2e281b964677ca36f0a9cf9ddb787c Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 18:37:12 +0800 Subject: [PATCH 04/24] change to qt 6 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3c109d..38c116e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-2019, macos-15] - qt_version: ['5.15.2'] + qt_version: ['6.*'] steps: - uses: actions/checkout@v4 From e29b1454218c455793c59f6f9625a62062355083 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 18:40:37 +0800 Subject: [PATCH 05/24] Remove architecture specification for Qt installation Removed architecture specification for Qt installation. --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38c116e..31da3cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,6 @@ jobs: uses: jurplel/install-qt-action@v4 with: version: ${{ matrix.qt_version }} - arch: x64 - name: Build on ${{ matrix.os }} shell: bash From 8e5868381ebaf8278159eacc5ba3e7b409ff57e5 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 18:43:02 +0800 Subject: [PATCH 06/24] Update Windows OS version in build workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31da3cd..05a3249 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-2019, macos-15] + os: [ubuntu-latest, windows-latest, macos-15] qt_version: ['6.*'] steps: From f9028b1e2b9a14722c711bbd0f13435f68d6e6b7 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 18:47:19 +0800 Subject: [PATCH 07/24] Update build.yml to remove Qt version Removed Qt version specification from build matrix. --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05a3249..4465732 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,6 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-15] - qt_version: ['6.*'] steps: - uses: actions/checkout@v4 @@ -22,8 +21,6 @@ jobs: sudo apt install libusb-1.0-0-dev - name: Install Qt uses: jurplel/install-qt-action@v4 - with: - version: ${{ matrix.qt_version }} - name: Build on ${{ matrix.os }} shell: bash From 2cbcf7f0409c0bdd05f1c669f69fc56158893866 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 18:53:11 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4465732..ea50c54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,8 @@ jobs: sudo apt install libusb-1.0-0-dev - name: Install Qt uses: jurplel/install-qt-action@v4 + with: + modules: serialport webenginewidgets core5compat - name: Build on ${{ matrix.os }} shell: bash From 4dbcca595a3fc5f3ec52bd4fde234824bb0ce45b Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 20:51:23 +0800 Subject: [PATCH 09/24] Update Qt modules in build workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea50c54..cec530e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - modules: serialport webenginewidgets core5compat + modules: qtserialport qt5compat qtwebengine - name: Build on ${{ matrix.os }} shell: bash From e3c3700ef3b3dd255fd6cc6320f9d4204e69720a Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 20:54:26 +0800 Subject: [PATCH 10/24] Update Qt modules in build workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cec530e..0a04681 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - modules: qtserialport qt5compat qtwebengine + modules: qtwebchannel qtpositioning qtserialport qt5compat qtwebengine - name: Build on ${{ matrix.os }} shell: bash From 57d924662c3cfe266ff7e28dc865b729a49656f4 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 14 Dec 2025 23:36:28 +0800 Subject: [PATCH 11/24] Add MSBuild setup for Windows in build workflow --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0a04681..3ba161c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,8 @@ jobs: uses: jurplel/install-qt-action@v4 with: modules: qtwebchannel qtpositioning qtserialport qt5compat qtwebengine - + - uses: microsoft/setup-msbuild@v2 + if: runner.os == 'Windows' - name: Build on ${{ matrix.os }} shell: bash run: | From c82b835ec99ad170691a7d31ff7714f3e4dc3a52 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Fri, 19 Dec 2025 23:18:38 +0800 Subject: [PATCH 12/24] Update GitHub Actions build workflow Refactor build steps for Windows and non-Windows environments. --- .github/workflows/build.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ba161c..004559a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,19 +23,23 @@ jobs: uses: jurplel/install-qt-action@v4 with: modules: qtwebchannel qtpositioning qtserialport qt5compat qtwebengine - - uses: microsoft/setup-msbuild@v2 + - name: Build on ${{ matrix.os }} + shell: cmd if: runner.os == 'Windows' + run: | + mkdir build + cd build + qmake ../qserial.pro + nmake || jom - name: Build on ${{ matrix.os }} shell: bash + if: runner.os != 'Windows' run: | mkdir build cd build qmake ../qserial.pro - if [[ "${{ runner.os }}" == "Windows" ]]; then - nmake || jom - else - make -j$(nproc) - fi + make -j$(nproc) + - name: Upload Artifacts uses: actions/upload-artifact@v4 From a57edb55b98309d229ba5ae2ce574ed39f1a231c Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Fri, 19 Dec 2025 23:33:36 +0800 Subject: [PATCH 13/24] Enhance CI with deployment steps for multiple OS Added deployment steps for Windows, macOS, and Linux. --- .github/workflows/build.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 004559a..361a93b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,14 +23,15 @@ jobs: uses: jurplel/install-qt-action@v4 with: modules: qtwebchannel qtpositioning qtserialport qt5compat qtwebengine + - uses: ilammy/msvc-dev-cmd@v1 - name: Build on ${{ matrix.os }} shell: cmd if: runner.os == 'Windows' run: | - mkdir build + md build cd build qmake ../qserial.pro - nmake || jom + nmake - name: Build on ${{ matrix.os }} shell: bash if: runner.os != 'Windows' @@ -40,6 +41,19 @@ jobs: qmake ../qserial.pro make -j$(nproc) + - name: Deploy (Windows) + if: matrix.os == 'windows-latest' + run: windeployqt build/QSerial.exe + + - name: Deploy (macOS) + if: matrix.os == 'macos-15' + run: macdeployqt build/QSerial.app -dmg + + - name: Deploy (Linux) + if: matrix.os == 'ubuntu-latest' + run: | + # Example using linuxdeployqt or creating a simple tarball + tar -czvf QSerial-Linux.tar.gz build/QSerial - name: Upload Artifacts uses: actions/upload-artifact@v4 @@ -47,8 +61,8 @@ jobs: name: qserial-${{ matrix.os }} path: | build/*.exe - build/qserial - build/*.app + *-Linux.tar.gz + build/*.dmg if-no-files-found: error release: From 47c3f90e29e52b8bcb7eb91ae9b26ade41ef49f7 Mon Sep 17 00:00:00 2001 From: z4yx Date: Sun, 21 Dec 2025 00:15:14 +0800 Subject: [PATCH 14/24] install libusb with vcpkg --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 361a93b..cf32049 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,10 +24,12 @@ jobs: with: modules: qtwebchannel qtpositioning qtserialport qt5compat qtwebengine - uses: ilammy/msvc-dev-cmd@v1 + - uses: lukka/run-vcpkg@v11 - name: Build on ${{ matrix.os }} shell: cmd if: runner.os == 'Windows' run: | + vcpkg install libusb md build cd build qmake ../qserial.pro From acd5f501bfdd185830baa818c84a3e8de3bf17c5 Mon Sep 17 00:00:00 2001 From: z4yx Date: Sun, 21 Dec 2025 00:36:33 +0800 Subject: [PATCH 15/24] windows only --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf32049..95f6c0a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,7 @@ jobs: modules: qtwebchannel qtpositioning qtserialport qt5compat qtwebengine - uses: ilammy/msvc-dev-cmd@v1 - uses: lukka/run-vcpkg@v11 + if: runner.os == 'Windows' - name: Build on ${{ matrix.os }} shell: cmd if: runner.os == 'Windows' From 6c8fb60d837fb71b5d3c91eefc8f255da150c989 Mon Sep 17 00:00:00 2001 From: z4yx Date: Sun, 21 Dec 2025 12:12:57 +0800 Subject: [PATCH 16/24] use vcpkg with cmds --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95f6c0a..7efe596 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,8 +24,6 @@ jobs: with: modules: qtwebchannel qtpositioning qtserialport qt5compat qtwebengine - uses: ilammy/msvc-dev-cmd@v1 - - uses: lukka/run-vcpkg@v11 - if: runner.os == 'Windows' - name: Build on ${{ matrix.os }} shell: cmd if: runner.os == 'Windows' From a892496ffeb3c0d92735357b03024ab354d35154 Mon Sep 17 00:00:00 2001 From: z4yx Date: Sun, 21 Dec 2025 14:19:41 +0800 Subject: [PATCH 17/24] list libusb files --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7efe596..e24ac89 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,6 +29,7 @@ jobs: if: runner.os == 'Windows' run: | vcpkg install libusb + dir /s C:/vcpkg/ md build cd build qmake ../qserial.pro From 9d903e52c3e3e50d9314029437bbc33b156e18a5 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 21 Dec 2025 23:11:53 +0800 Subject: [PATCH 18/24] Fix path syntax for Windows command in build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e24ac89..20b8b83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: if: runner.os == 'Windows' run: | vcpkg install libusb - dir /s C:/vcpkg/ + dir /s C:\vcpkg md build cd build qmake ../qserial.pro From d4006b660503e8d60c64b6ae06cf58c8406006fe Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Sun, 21 Dec 2025 23:53:24 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20b8b83..469b07e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,7 @@ jobs: run: | vcpkg install libusb dir /s C:\vcpkg + set PKG_CONFIG_PATH=C:/vcpkg/packages/libusb_x64-windows/lib/pkgconfig;%PKG_CONFIG_PATH% md build cd build qmake ../qserial.pro From 76a800826acce58bfc35abd77423fd3315fde918 Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Mon, 22 Dec 2025 00:05:09 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20serialportcp210x.cpp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- drivers/serialportcp210x.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/serialportcp210x.cpp b/drivers/serialportcp210x.cpp index fe595b4..e17646e 100644 --- a/drivers/serialportcp210x.cpp +++ b/drivers/serialportcp210x.cpp @@ -1,6 +1,8 @@ #include "serialportcp210x.h" #include #include +#include + #define CP210X_CTRL_IN \ (LIBUSB_RECIPIENT_INTERFACE | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_IN) From c28fb538c7b8e1b2e36bb85a21134aadc5b5220f Mon Sep 17 00:00:00 2001 From: Yuxiang Zhang Date: Mon, 22 Dec 2025 00:34:24 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20serialportcp210x.cpp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- drivers/serialportcp210x.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/serialportcp210x.cpp b/drivers/serialportcp210x.cpp index e17646e..6260973 100644 --- a/drivers/serialportcp210x.cpp +++ b/drivers/serialportcp210x.cpp @@ -30,14 +30,20 @@ #define TIMEOUT 300 -struct Q_PACKED SerialStatusResponse { - quint32 ulErrors; - quint32 ulHoldReasons; - quint32 ulAmountInInQueue; - quint32 ulAmountInOutQueue; - quint8 bEofReceived; - quint8 bWaitForImmediate; - quint8 bReserved; +#ifdef _MSC_VER + #define PACKED_STRUCT __declspec(align(1)) +#else + #define PACKED_STRUCT __attribute__((packed)) +#endif + +struct PACKED_STRUCT SerialStatusResponse { + uint32_t ulErrors; + uint32_t ulHoldReasons; + uint32_t ulAmountInInQueue; + uint32_t ulAmountInOutQueue; + uint8_t bEofReceived; + uint8_t bWaitForImmediate; + uint8_t bReserved; }; SerialPortCP210X::SerialPortCP210X(QObject *parent, libusb_device *device) From eeb666e8d25d64770df27aebeea016105abb24cd Mon Sep 17 00:00:00 2001 From: z4yx Date: Mon, 22 Dec 2025 13:40:49 +0800 Subject: [PATCH 22/24] fix windeploy qt --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 469b07e..b172838 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,12 +29,12 @@ jobs: if: runner.os == 'Windows' run: | vcpkg install libusb - dir /s C:\vcpkg set PKG_CONFIG_PATH=C:/vcpkg/packages/libusb_x64-windows/lib/pkgconfig;%PKG_CONFIG_PATH% md build cd build qmake ../qserial.pro nmake + dir /s - name: Build on ${{ matrix.os }} shell: bash if: runner.os != 'Windows' @@ -46,7 +46,7 @@ jobs: - name: Deploy (Windows) if: matrix.os == 'windows-latest' - run: windeployqt build/QSerial.exe + run: windeployqt build/release/QSerial.exe - name: Deploy (macOS) if: matrix.os == 'macos-15' @@ -56,6 +56,7 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | # Example using linuxdeployqt or creating a simple tarball + ldd build/QSerial tar -czvf QSerial-Linux.tar.gz build/QSerial - name: Upload Artifacts @@ -63,7 +64,7 @@ jobs: with: name: qserial-${{ matrix.os }} path: | - build/*.exe + build/release *-Linux.tar.gz build/*.dmg if-no-files-found: error From c38c9d1542194752e4f8cf90ae445e9fe11dd75c Mon Sep 17 00:00:00 2001 From: z4yx Date: Mon, 22 Dec 2025 18:24:32 +0800 Subject: [PATCH 23/24] remove obj files --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b172838..90fa746 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,7 @@ jobs: qmake ../qserial.pro nmake dir /s + del build\release\*.obj build\release\*.cpp - name: Build on ${{ matrix.os }} shell: bash if: runner.os != 'Windows' @@ -57,7 +58,7 @@ jobs: run: | # Example using linuxdeployqt or creating a simple tarball ldd build/QSerial - tar -czvf QSerial-Linux.tar.gz build/QSerial + #tar -czvf QSerial-Linux.tar.gz build/QSerial - name: Upload Artifacts uses: actions/upload-artifact@v4 @@ -65,7 +66,7 @@ jobs: name: qserial-${{ matrix.os }} path: | build/release - *-Linux.tar.gz + build/QSerial build/*.dmg if-no-files-found: error From 6efbcc6075a50c50f2fafae0c8503abf1a226066 Mon Sep 17 00:00:00 2001 From: z4yx Date: Mon, 22 Dec 2025 18:38:35 +0800 Subject: [PATCH 24/24] fix del paths --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 34 ---------------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 90fa746..2f45cdf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: qmake ../qserial.pro nmake dir /s - del build\release\*.obj build\release\*.cpp + del release\*.obj release\*.cpp - name: Build on ${{ matrix.os }} shell: bash if: runner.os != 'Windows' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 364aabd..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Create macOS release on tag push - -on: - push: - tags: - - "v*" - -jobs: - build: - runs-on: macos-latest - steps: - - uses: actions/checkout@v3 - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - modules: qtwebengine - - name: qmake - run: qmake qserial.pro - - name: make - run: make - - name: Change libusb path - run: install_name_tool -change /usr/local/opt/libusb/lib/libusb-1.0.0.dylib @executable_path/../Frameworks/libusb-1.0.0.dylib QSerial.app/Contents/MacOS/QSerial - - name: Copy libusb to frameworks - run: mkdir -p QSerial.app/Contents/Frameworks && cp /usr/local/lib/libusb-1.0.0.dylib QSerial.app/Contents/Frameworks/libusb-1.0.0.dylib - - name: Qt mac deploy to .dmg - run: macdeployqt QSerial.app -verbose=1 -dmg - - name: Release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - files: QSerial.dmg - -permissions: - contents: write