diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 933159f..1cdce0d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,7 +150,7 @@ jobs: needs: [test, version, vendor] runs-on: ubuntu-latest container: - image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-47 + image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-50 options: --privileged steps: - uses: actions/checkout@v4 @@ -164,7 +164,7 @@ jobs: with: bundle: io.github.tommyfang.DshDesktop.flatpak 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 - name: Attach Flatpak to GitHub Release diff --git a/README.md b/README.md index 5471be9..15cf845 100644 --- a/README.md +++ b/README.md @@ -200,9 +200,9 @@ Flatpak 是唯一把 `dsh` 打进包内的渠道。 ```bash flatpak remote-add --user --if-not-exists flathub \ https://dl.flathub.org/repo/flathub.flatpakrepo -flatpak install --user -y flathub org.gnome.Sdk//47 org.flatpak.Builder \ - org.freedesktop.Sdk.Extension.rust-stable//24.08 \ - org.freedesktop.Sdk.Extension.node24//24.08 +flatpak install --user -y flathub org.gnome.Sdk//50 org.flatpak.Builder \ + org.freedesktop.Sdk.Extension.rust-stable//25.08 \ + org.freedesktop.Sdk.Extension.node24//25.08 make vendor make flatpak-build diff --git a/flatpak/io.github.tommyfang.DshDesktop.yml b/flatpak/io.github.tommyfang.DshDesktop.yml index f109c1d..e0b9a1a 100644 --- a/flatpak/io.github.tommyfang.DshDesktop.yml +++ b/flatpak/io.github.tommyfang.DshDesktop.yml @@ -1,6 +1,6 @@ app-id: io.github.tommyfang.DshDesktop runtime: org.gnome.Platform -runtime-version: '47' +runtime-version: '50' sdk: org.gnome.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.node24 @@ -50,6 +50,7 @@ modules: build-args: - --share=network build-commands: + - mkdir -p vendor/modlens vendor/anchored-standard vendor/zero-anchored-standard - cargo build --release --locked --offline || cargo build --release - install -Dm755 target/release/dsh-desktop ${FLATPAK_DEST}/bin/dsh-desktop - mkdir -p ${FLATPAK_DEST}/share/dsh-desktop/vision