From 16faf95b67147ebbdb3bf57aa2ac9bc8456ed989 Mon Sep 17 00:00:00 2001 From: PancakeTAS Date: Fri, 25 Jul 2025 16:28:56 +0200 Subject: [PATCH] test: update workflows --- .../{update-flatpak-23.08.yml => flatpak.yml} | 18 +++-- .github/workflows/update-flatpak-24.08.yml | 20 ------ .github/workflows/update-ui.yml | 68 ------------------- 3 files changed, 11 insertions(+), 95 deletions(-) rename .github/workflows/{update-flatpak-23.08.yml => flatpak.yml} (59%) delete mode 100644 .github/workflows/update-flatpak-24.08.yml delete mode 100644 .github/workflows/update-ui.yml diff --git a/.github/workflows/update-flatpak-23.08.yml b/.github/workflows/flatpak.yml similarity index 59% rename from .github/workflows/update-flatpak-23.08.yml rename to .github/workflows/flatpak.yml index d2c85e1..298a6c2 100644 --- a/.github/workflows/update-flatpak-23.08.yml +++ b/.github/workflows/flatpak.yml @@ -1,20 +1,24 @@ -name: Update lsfg-vk Flatpak (23.08) +name: (Test) Build lsfg-vk Flatpak extensions + on: push: - branches: ["develop", "flatpak"] + branches: ["test/deploying"] jobs: - update-flatpak: + flatpak: runs-on: ubuntu-latest + strategy: + matrix: + version: ["23.08", "24.08"] container: - image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-23.08 + image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-${{ matrix.version }} options: --privileged steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Build Flatpak extension + - name: Build Flatpak extension (${{ matrix.version }}) uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: - bundle: "org.freedesktop.Platform.VulkanLayer.lsfg_vk_23.08.flatpak" - manifest-path: "flatpak/org.freedesktop.Platform.VulkanLayer.lsfgvk_23.08.yml" + bundle: "org.freedesktop.Platform.VulkanLayer.lsfg_vk_${{ matrix.version }}.flatpak" + manifest-path: "flatpak/org.freedesktop.Platform.VulkanLayer.lsfgvk_${{ matrix.version }}.yml" verbose: true diff --git a/.github/workflows/update-flatpak-24.08.yml b/.github/workflows/update-flatpak-24.08.yml deleted file mode 100644 index 906a901..0000000 --- a/.github/workflows/update-flatpak-24.08.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Update lsfg-vk Flatpak (24.08) -on: - push: - branches: ["develop", "flatpak"] - -jobs: - update-flatpak: - runs-on: ubuntu-latest - container: - image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-24.08 - options: --privileged - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Build Flatpak extension - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 - with: - bundle: "org.freedesktop.Platform.VulkanLayer.lsfg_vk_24.08.flatpak" - manifest-path: "flatpak/org.freedesktop.Platform.VulkanLayer.lsfgvk_24.08.yml" - verbose: true diff --git a/.github/workflows/update-ui.yml b/.github/workflows/update-ui.yml deleted file mode 100644 index 69e8489..0000000 --- a/.github/workflows/update-ui.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: Update lsfg-vk-ui app image -on: - push: - branches: ["develop"] - -jobs: - update-ui: - runs-on: ubuntu-latest - container: - image: archlinux:latest - steps: - - name: Prepare cache for pacman packages - uses: actions/cache@v4 - with: - path: /var/cache/pacman/pkg - key: archlinux-pacman-cache - - name: Create cache directories - run: | - mkdir -p /root/.cargo - mkdir -p /root/.rustup - - name: Prepare cache for rustup - uses: actions/cache@v4 - with: - path: /root/.rustup - key: archlinux-rustup-cache - - name: Prepare cache for cargo - uses: actions/cache@v4 - with: - path: /root/.cargo - key: archlinux-cargo-cache - - name: Install build dependencies - run: | - pacman -Syu --noconfirm \ - base-devel git \ - clang llvm \ - rustup gcc \ - cmake ninja \ - vulkan-headers vulkan-icd-loader \ - xorg wayland wayland-protocols mesa-utils \ - wget gdk-pixbuf2 gtk4 libadwaita fuse - - name: Update Rust toolchain - run: | - rustup default stable - - name: Update Cargo tools - run: | - cargo install cargo-appimage - - name: Checkout repository - uses: actions/checkout@v4 - with: - submodules: 'recursive' - - name: Grab continuous appimagetool - run: | - wget -O appimagetool https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage - chmod +x appimagetool - ./appimagetool --appimage-extract - mv squashfs-root/usr/bin/* ui/ - - name: Build UI with Cargo - run: | - cd ui - PATH=$PATH:$PWD cargo appimage - cd .. - mv ui/target/appimage/ui.AppImage lsfg-vk-ui.AppImage - - name: Upload lsfg-vk artifact - uses: actions/upload-artifact@v4 - with: - name: lsfg-vk-ui - path: | - lsfg-vk-ui.AppImage