From 982c8b4df2dfbef918621eaea79879fb90dc4d6e Mon Sep 17 00:00:00 2001 From: oomeow Date: Thu, 2 Oct 2025 12:32:55 +0800 Subject: [PATCH 1/3] fix: drag and drop (#4924) --- src/components/home/test-card.tsx | 2 ++ src/pages/profiles.tsx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/components/home/test-card.tsx b/src/components/home/test-card.tsx index 5c369b51..51850090 100644 --- a/src/components/home/test-card.tsx +++ b/src/components/home/test-card.tsx @@ -5,6 +5,7 @@ import { useSensor, useSensors, DragEndEvent, + DragOverlay, } from "@dnd-kit/core"; import { SortableContext } from "@dnd-kit/sortable"; import { Add, NetworkCheck } from "@mui/icons-material"; @@ -196,6 +197,7 @@ export const TestCard = () => { onDragEnd={onDragEnd} > {renderTestItems} + diff --git a/src/pages/profiles.tsx b/src/pages/profiles.tsx index c7ac3e67..bd2cdd5a 100644 --- a/src/pages/profiles.tsx +++ b/src/pages/profiles.tsx @@ -2,6 +2,7 @@ import { closestCenter, DndContext, DragEndEvent, + DragOverlay, KeyboardSensor, PointerSensor, useSensor, @@ -898,6 +899,7 @@ const ProfilePage = () => { + Date: Thu, 2 Oct 2025 12:32:12 +0800 Subject: [PATCH 2/3] ci: add linux dev bundle --- .github/workflows/dev.yml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 89a55a30..bda3e71a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -18,6 +18,11 @@ on: required: false type: boolean default: true + run_linux_amd64: + description: "运行 Linux amd64" + required: false + type: boolean + default: true permissions: write-all env: @@ -50,6 +55,11 @@ jobs: bundle: nsis id: windows-arm64 input: run_windows_arm64 + - os: linux-latest + target: x86_64-unknown-linux-gnu + bundle: deb + id: linux-amd64 + input: run_linux_amd64 runs-on: ${{ matrix.os }} steps: @@ -78,6 +88,12 @@ jobs: cache-all-crates: true shared-key: autobuild-shared + - name: Install dependencies (ubuntu only) + if: matrix.os == 'linux-latest' && github.event.inputs[matrix.input] == 'true' + run: | + sudo apt-get update + sudo apt-get install -y libxslt1.1 libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev patchelf + - uses: pnpm/action-setup@v4 name: Install pnpm if: github.event.inputs[matrix.input] == 'true' @@ -119,7 +135,7 @@ jobs: tauriScript: pnpm args: --target ${{ matrix.target }} -b ${{ matrix.bundle }} - - name: Upload Artifacts + - name: Upload Artifacts (macOS) if: matrix.os == 'macos-latest' && github.event.inputs[matrix.input] == 'true' uses: actions/upload-artifact@v4 with: @@ -127,10 +143,18 @@ jobs: path: src-tauri/target/${{ matrix.target }}/release/bundle/dmg/*.dmg if-no-files-found: error - - name: Upload Artifacts + - name: Upload Artifacts (Windows) if: matrix.os == 'windows-latest' && github.event.inputs[matrix.input] == 'true' uses: actions/upload-artifact@v4 with: name: ${{ matrix.target }} path: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*.exe if-no-files-found: error + + - name: Upload Artifacts (Linux) + if: matrix.os == 'linux-latest' && github.event.inputs[matrix.input] == 'true' + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.target }} + path: src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb + if-no-files-found: error From c5023b4505c5cf4797b0b3f7f987cd43ecd09ce8 Mon Sep 17 00:00:00 2001 From: oomeow Date: Thu, 2 Oct 2025 12:46:56 +0800 Subject: [PATCH 3/3] ci: use ubuntu-22.04 on dev bundle workflow --- .github/workflows/dev.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index bda3e71a..b078aa0d 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -55,7 +55,7 @@ jobs: bundle: nsis id: windows-arm64 input: run_windows_arm64 - - os: linux-latest + - os: ubuntu-22.04 target: x86_64-unknown-linux-gnu bundle: deb id: linux-amd64 @@ -89,7 +89,7 @@ jobs: shared-key: autobuild-shared - name: Install dependencies (ubuntu only) - if: matrix.os == 'linux-latest' && github.event.inputs[matrix.input] == 'true' + if: matrix.os == 'ubuntu-22.04' && github.event.inputs[matrix.input] == 'true' run: | sudo apt-get update sudo apt-get install -y libxslt1.1 libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev patchelf @@ -152,7 +152,7 @@ jobs: if-no-files-found: error - name: Upload Artifacts (Linux) - if: matrix.os == 'linux-latest' && github.event.inputs[matrix.input] == 'true' + if: matrix.os == 'ubuntu-22.04' && github.event.inputs[matrix.input] == 'true' uses: actions/upload-artifact@v4 with: name: ${{ matrix.target }}