diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b58aa5e..7d88ba2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: name: Rustfmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -24,12 +24,12 @@ jobs: name: "Flatpak" runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:gnome-45 + image: bilelmoussaoui/flatpak-github-actions:gnome-nightly options: --privileged steps: - - uses: actions/checkout@v3 - - uses: flatpak/flatpak-github-actions/flatpak-builder@v6.2 - with: - bundle: rollit.flatpak - manifest-path: build-aux/flatpak/dev.zelikos.rollit.Devel.json - cache-key: flatpak-builder-${{ github.sha }} + - uses: actions/checkout@v4 + - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 + with: + bundle: rollit.flatpak + manifest-path: build-aux/flatpak/dev.zelikos.rollit.Devel.json + cache-key: flatpak-builder-${{ github.sha }} diff --git a/build-aux/flatpak/dev.zelikos.rollit.Devel.json b/build-aux/flatpak/dev.zelikos.rollit.Devel.json index 14e73ad..91fd658 100644 --- a/build-aux/flatpak/dev.zelikos.rollit.Devel.json +++ b/build-aux/flatpak/dev.zelikos.rollit.Devel.json @@ -1,71 +1,63 @@ { - "id" : "dev.zelikos.rollit.Devel", - "runtime" : "org.gnome.Platform", - "runtime-version" : "master", - "sdk" : "org.gnome.Sdk", - "sdk-extensions" : [ - "org.freedesktop.Sdk.Extension.rust-stable", - "org.freedesktop.Sdk.Extension.llvm16" - ], - "command" : "rollit", - "finish-args" : [ - "--share=ipc", - "--socket=fallback-x11", - "--device=dri", - "--socket=wayland", - "--env=RUST_BACKTRACE=1", - "--env=RUST_LOG=rollit=debug" - ], - "build-options" : { - "append-path" : "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin", - "build-args" : [ - "--share=network" - ], - "env" : { - "CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse", - "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER" : "clang", - "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER" : "clang", - "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold", - "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS" : "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold" + "id": "dev.zelikos.rollit.Devel", + "runtime": "org.gnome.Platform", + "runtime-version": "46", + "sdk": "org.gnome.Sdk", + "sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable", "org.freedesktop.Sdk.Extension.llvm16"], + "command": "rollit", + "finish-args": [ + "--share=ipc", + "--socket=fallback-x11", + "--device=dri", + "--socket=wayland", + "--env=RUST_BACKTRACE=1", + "--env=RUST_LOG=rollit=debug" + ], + "build-options": { + "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin", + "build-args": ["--share=network"], + "env": { + "CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse", + "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang", + "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER": "clang", + "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold", + "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold" + } + }, + "cleanup": [ + "/include", + "/lib/pkgconfig", + "/man", + "/share/doc", + "/share/gtk-doc", + "/share/man", + "/share/pkgconfig", + "*.la", + "*.a" + ], + "modules": [ + { + "name": "blueprint-compiler", + "buildsystem": "meson", + "cleanup": ["*"], + "sources": [ + { + "type": "git", + "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler", + "tag": "v0.12.0" } + ] }, - "cleanup" : [ - "/include", - "/lib/pkgconfig", - "/man", - "/share/doc", - "/share/gtk-doc", - "/share/man", - "/share/pkgconfig", - "*.la", - "*.a" - ], - "modules" : [ - { - "name": "blueprint-compiler", - "buildsystem": "meson", - "cleanup": ["*"], - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler", - "tag": "v0.12.0" - } - ] - }, + { + "name": "rollit", + "buildsystem": "meson", + "config-opts": ["-Dprofile=development"], + "sources": [ { - "name" : "rollit", - "buildsystem" : "meson", - "config-opts": [ - "-Dprofile=development" - ], - "sources" : [ - { - "type" : "dir", - "path" : "../../" - } - ] + "type": "dir", + "path": "../../" } - ] + ] + } + ] } -