TomHanck4/dsh-easy-desktop
1
0
Fork 0
mirror of https://github.com/TommyFang2077/dsh-desktop.git synced 2026-08-17 09:06:36 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fix Flatpak CI: stub vendor dirs for tauri-build and move to GNOME 50.

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Tommy
2026-08-15 22:43:33 +08:00
parent edab39cae2
commit 27af857d4b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/release.yml vendored
View File

@@ -150,7 +150,7 @@ jobs:
needs: [test, version, vendor] needs: [test, version, vendor]
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-47 image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-50
options: --privileged options: --privileged
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -164,7 +164,7 @@ jobs:
with: with:
bundle: io.github.tommyfang.DshDesktop.flatpak bundle: io.github.tommyfang.DshDesktop.flatpak
manifest-path: flatpak/io.github.tommyfang.DshDesktop.yml manifest-path: flatpak/io.github.tommyfang.DshDesktop.yml
cache-key: flatpak-gnome-47-${{ hashFiles('flatpak/io.github.tommyfang.DshDesktop.yml', 'Cargo.lock') }} cache-key: flatpak-gnome-50-${{ hashFiles('flatpak/io.github.tommyfang.DshDesktop.yml', 'Cargo.lock') }}
upload-artifact: false upload-artifact: false
- name: Attach Flatpak to GitHub Release - name: Attach Flatpak to GitHub Release

6
README.md
View File

@@ -200,9 +200,9 @@ Flatpak 是唯一把 `dsh` 打进包内的渠道。
```bash ```bash
flatpak remote-add --user --if-not-exists flathub \ flatpak remote-add --user --if-not-exists flathub \
https://dl.flathub.org/repo/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo
flatpak install --user -y flathub org.gnome.Sdk//47 org.flatpak.Builder \ flatpak install --user -y flathub org.gnome.Sdk//50 org.flatpak.Builder \
org.freedesktop.Sdk.Extension.rust-stable//24.08 \ org.freedesktop.Sdk.Extension.rust-stable//25.08 \
org.freedesktop.Sdk.Extension.node24//24.08 org.freedesktop.Sdk.Extension.node24//25.08
make vendor make vendor
make flatpak-build make flatpak-build

3
flatpak/io.github.tommyfang.DshDesktop.yml
View File

@@ -1,6 +1,6 @@
app-id: io.github.tommyfang.DshDesktop app-id: io.github.tommyfang.DshDesktop
runtime: org.gnome.Platform runtime: org.gnome.Platform
runtime-version: '47' runtime-version: '50'
sdk: org.gnome.Sdk sdk: org.gnome.Sdk
sdk-extensions: sdk-extensions:
- org.freedesktop.Sdk.Extension.node24 - org.freedesktop.Sdk.Extension.node24
@@ -50,6 +50,7 @@ modules:
build-args: build-args:
- --share=network - --share=network
build-commands: build-commands:
- mkdir -p vendor/modlens vendor/anchored-standard vendor/zero-anchored-standard
- cargo build --release --locked --offline || cargo build --release - cargo build --release --locked --offline || cargo build --release
- install -Dm755 target/release/dsh-desktop ${FLATPAK_DEST}/bin/dsh-desktop - install -Dm755 target/release/dsh-desktop ${FLATPAK_DEST}/bin/dsh-desktop
- mkdir -p ${FLATPAK_DEST}/share/dsh-desktop/vision - mkdir -p ${FLATPAK_DEST}/share/dsh-desktop/vision