diff --git a/.github/workflows/build-arch.yml b/.github/workflows/build-arch.yml deleted file mode 100644 index 58a2a42..0000000 --- a/.github/workflows/build-arch.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Build lsfg-vk on Arch Linux -on: - push: - branches: ["develop"] - -jobs: - build-arch: - 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: Install build dependencies - run: | - pacman -Syu --noconfirm \ - base-devel git \ - clang llvm \ - cmake ninja \ - vulkan-headers vulkan-icd-loader \ - xorg wayland wayland-protocols mesa-utils - - name: Checkout repository - uses: actions/checkout@v4 - with: - submodules: 'recursive' - - name: Configure with CMake and Ninja - run: | - CC=clang CXX=clang++ cmake -B build -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=./build-release - - name: Build with Ninja - run: | - ninja -C build - - name: Install with CMake - run: | - cmake --install build - - name: Upload lsfg-vk artifact - uses: actions/upload-artifact@v4 - with: - name: lsfg-vk_archlinux - path: | - build-release/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json - build-release/lib/liblsfg-vk.so diff --git a/.github/workflows/build-debian.yml b/.github/workflows/build-debian.yml deleted file mode 100644 index a16a316..0000000 --- a/.github/workflows/build-debian.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Build lsfg-vk on Debian -on: - push: - branches: ["develop"] - -jobs: - build-debian: - runs-on: ubuntu-latest - container: - image: debian:trixie - steps: - - name: Prepare cache for apt packages - uses: actions/cache@v4 - with: - path: /var/cache/apt/archives - key: debian-apt-cache - - name: Install build dependencies - run: | - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get install -y \ - build-essential \ - clang clang-tools llvm \ - git \ - cmake ninja-build \ - libvulkan-dev \ - xorg-dev xutils-dev \ - libwayland-dev libxkbcommon-dev - - name: Checkout repository - uses: actions/checkout@v4 - with: - submodules: 'recursive' - - name: Configure with CMake and Ninja - run: | - CC=clang CXX=clang++ cmake -B build -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=./build-release - - name: Build with Ninja - run: | - ninja -C build - - name: Install with CMake - run: | - cmake --install build - - name: Upload lsfg-vk artifact - uses: actions/upload-artifact@v4 - with: - name: lsfg-vk_debian - path: | - build-release/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json - build-release/lib/liblsfg-vk.so diff --git a/.github/workflows/build-fedora.yml b/.github/workflows/build-fedora.yml deleted file mode 100644 index 2ad5b74..0000000 --- a/.github/workflows/build-fedora.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: Build lsfg-vk on Fedora -on: - push: - branches: ["develop"] - -jobs: - build-fedora: - runs-on: ubuntu-latest - container: - image: fedora:latest - steps: - - name: Prepare cache for dnf packages - uses: actions/cache@v4 - with: - path: /var/cache/libdnf5 - key: fedora-dnf-cache - - name: Install build dependencies - run: | - echo "keepcache=1" >> /etc/dnf/dnf.conf - dnf update -y - dnf install -y \ - git \ - clang llvm \ - cmake ninja-build \ - vulkan-headers vulkan-loader-devel \ - libX11-devel libXrandr-devel libXinerama-devel libXcursor-devel libXi-devel mesa-libGL-devel \ - wayland-devel libxkbcommon-devel - - name: Checkout repository - uses: actions/checkout@v4 - with: - submodules: 'recursive' - - name: Configure with CMake and Ninja - run: | - CC=clang CXX=clang++ cmake -B build -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=./build-release - - name: Build with Ninja - run: | - ninja -C build - - name: Install with CMake - run: | - cmake --install build - - name: Upload lsfg-vk artifact - uses: actions/upload-artifact@v4 - with: - name: lsfg-vk_fedora - path: | - build-release/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json - build-release/lib/liblsfg-vk.so diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build.yml similarity index 77% rename from .github/workflows/build-ubuntu.yml rename to .github/workflows/build.yml index f7c2a4a..837070d 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,10 @@ -name: Build lsfg-vk on Ubuntu +name: (Test) Build lsfg-vk on: push: - branches: ["develop"] + branches: ["test/deploying"] jobs: - build-ubuntu: + build: runs-on: ubuntu-latest steps: - name: Install build dependencies @@ -12,11 +12,8 @@ jobs: with: packages: build-essential clang clang-tools llvm - git - cmake ninja-build + git cmake ninja-build libvulkan-dev - xorg-dev xutils-dev - libwayland-dev libxkbcommon-x11-dev version: 1.0 execute_install_scripts: true - name: Checkout repository @@ -25,7 +22,7 @@ jobs: submodules: 'recursive' - name: Configure with CMake and Ninja run: | - CC=clang CXX=clang++ cmake -B build -G Ninja \ + cmake -B build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=./build-release - name: Build with Ninja @@ -37,7 +34,7 @@ jobs: - name: Upload lsfg-vk artifact uses: actions/upload-artifact@v4 with: - name: lsfg-vk_ubuntu + name: lsfg-vk_TEST path: | build-release/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json build-release/lib/liblsfg-vk.so