From 402a24621c30fec8b52c0ec88dc097226c1aafc7 Mon Sep 17 00:00:00 2001 From: PancakeTAS Date: Thu, 24 Jul 2025 20:02:14 +0200 Subject: [PATCH] test: appimage in workflow --- .github/workflows/build.yml | 42 +++++++++++++++++++++++++++++-------- ui/Cargo.lock | 28 ++++++++++++------------- ui/Cargo.toml | 13 ++---------- 3 files changed, 49 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32f412d..cb70b40 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,25 +1,38 @@ name: (Test) Build lsfg-vk + on: push: branches: ["test/deploying"] +env: + CARGO_TERM_COLOR: always + jobs: build: runs-on: ubuntu-latest steps: - - name: Install build dependencies - uses: awalsh128/cache-apt-pkgs-action@latest - with: - packages: git - clang llvm - cmake ninja-build - libvulkan-dev - version: 1.0 - execute_install_scripts: true + # prepare system - name: Checkout repository uses: actions/checkout@v4 with: submodules: 'recursive' + - name: Install build dependencies + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: git wget + clang clang-tools llvm rustup + cmake ninja-build pkg-config + libvulkan-dev + libgtk-4-dev libadwaita-1-dev + version: 1.0 + execute_install_scripts: true + - name: Install rust dependencies + run: | + rustup default stable + cargo install cargo-appimage + wget -O ui/appimagetool https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage + chmod +x ui/appimagetool + # build the project - name: Configure with CMake and Ninja run: | cmake -B build -G Ninja \ @@ -31,6 +44,16 @@ jobs: - name: Install with CMake run: | cmake --install build --strip + - name: Build lsfg-vk-ui with Cargo + run: | + pushd ui + PATH=$PATH:$PWD cargo appimage + popd + - name: Install lsfg-vk-ui + run: | + mkdir -p build-release/bin + mv ui/target/appimage/lsfg-vk-ui.AppImage build-release/bin/lsfg-vk-ui + # upload all files - name: Upload lsfg-vk artifact uses: actions/upload-artifact@v4 with: @@ -38,3 +61,4 @@ jobs: path: | build-release/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json build-release/lib/liblsfg-vk.so + build-release/bin/lsfg-vk-ui diff --git a/ui/Cargo.lock b/ui/Cargo.lock index c8ae7e4..653ad82 100644 --- a/ui/Cargo.lock +++ b/ui/Cargo.lock @@ -680,6 +680,20 @@ version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +[[package]] +name = "lsfg-vk-ui" +version = "0.0.1" +dependencies = [ + "anyhow", + "glib-build-tools", + "gtk4", + "libadwaita", + "proc-maps", + "procfs", + "serde", + "toml 0.9.2", +] + [[package]] name = "mach2" version = "0.4.3" @@ -1090,20 +1104,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64" -[[package]] -name = "ui" -version = "0.0.1" -dependencies = [ - "anyhow", - "glib-build-tools", - "gtk4", - "libadwaita", - "proc-maps", - "procfs", - "serde", - "toml 0.9.2", -] - [[package]] name = "unicode-ident" version = "1.0.18" diff --git a/ui/Cargo.toml b/ui/Cargo.toml index ec0c05f..2056f35 100644 --- a/ui/Cargo.toml +++ b/ui/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ui" +name = "lsfg-vk-ui" version = "0.0.1" edition = "2021" @@ -21,14 +21,5 @@ auto_link_exclude_list = [ "ld-linux*", "libc.so*", "libm.so*", - "libresolv.so*", - "libstdc++.so*", - "libxcb.so*", - "libX11.so*", - "libwayland-client.so*", - "libfontconfig.so*", - "libfreetype.so*", - "libexpat.so*", - "libgcc_s.so*", - "libz.so*" + "libresolv.so*" ]