refactor(cleanup): version bump & release workflow

This commit is contained in:
PancakeTAS 2025-12-24 16:47:01 +01:00
parent f5906116ea
commit adffd92357
No known key found for this signature in database
9 changed files with 29 additions and 17 deletions

View file

@ -4,6 +4,9 @@ on:
push:
branches: ["release", "develop"]
permissions:
contents: write
jobs:
build:
runs-on: ubuntu-22.04
@ -34,12 +37,13 @@ jobs:
- name: Configure lsfg-vk
run: |
cmake -B build -G Ninja \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=./target \
-DCMAKE_CXX_COMPILER=clang++ \
-DLSFGVK_BUILD_VULKAN_LAYER=On \
-DLSFGVK_BUILD_USER_INTERFACE=On \
-DLSFGVK_INSTALL_XDG_FILES=On
-DLSFGVK_INSTALL_XDG_FILES=On \
-DLSFGVK_LAYER_LIBRARY_PATH="../../../lib/liblsfg-vk-layer.so"
- name: Build with Ninja
run: |
ninja -C build
@ -53,3 +57,14 @@ jobs:
name: lsfg-vk
path: |
target/*
- name: Compress lsfg-vk for release
run: |
tar -cJf "lsfg-vk-2.0.0-dev${{ github.run_number }}-linux.tar.xz" -C target .
- name: Update pre-release version
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: v2.0.0-dev
title: "lsfg-vk 2.0.0-dev${{ github.run_number }}"
files: |
lsfg-vk-2.0.0-dev${{ github.run_number }}-linux.tar.xz

View file

@ -22,7 +22,6 @@ jobs:
bundle: "org.freedesktop.Platform.VulkanLayer.lsfg_vk_${{ matrix.version }}.flatpak"
manifest-path: "dist/flatpak/lsfg-vk-layer/org.freedesktop.Platform.VulkanLayer.lsfgvk_${{ matrix.version }}.yml"
branch: "${{ matrix.version }}"
cache: false
flatpak-ui:
runs-on: ubuntu-latest
container:
@ -37,4 +36,3 @@ jobs:
bundle: "gay.pancake.lsfg-vk-ui.flatpak"
manifest-path: "dist/flatpak/lsfg-vk-ui/gay.pancake.lsfg-vk-ui.yml"
branch: "${{ github.ref_name }}"
cache: false

View file

@ -61,7 +61,8 @@ jobs:
-DCMAKE_CXX_COMPILER=clang++ \
-DLSFGVK_BUILD_VULKAN_LAYER=On \
-DLSFGVK_BUILD_USER_INTERFACE=On \
-DLSFGVK_INSTALL_XDG_FILES=On
-DLSFGVK_INSTALL_XDG_FILES=On \
-DLSFGVK_LAYER_LIBRARY_PATH="../../../lib/liblsfg-vk-layer.so"
- name: Build with Ninja
run: |
ninja -C build

View file

@ -6,8 +6,9 @@ include(GNUInstallDirs)
option(LSFGVK_BUILD_VULKAN_LAYER "Build the Vulkan layer" ON)
option(LSFGVK_BUILD_USER_INTERFACE "Build the user interface" OFF)
option(LSFGVK_BUILD_DEBUG_TOOL "Build the debug tool" OFF)
option(LSFGVK_INSTALL_DEVELOP "Install development files" OFF)
option(LSFGVK_INSTALL_XDG_FILES "Install xdg app files" OFF)
option(LSFGVK_INSTALL_DEVELOP "Install development libraries and headers" OFF)
option(LSFGVK_INSTALL_XDG_FILES "Install the application icon and desktop files" OFF)
option(LSFGVK_LAYER_LIBRARY_PATH "Change where Vulkan searches for the layer library" liblsfg-vk-layer.so)
# === READ HERE FOR BUILD OPTIONS ===
set(CMAKE_CXX_STANDARD 20)

View file

@ -21,7 +21,7 @@
</description>
<releases>
<release date="2025-08-28" version="1.1.0-dev" />
<release date="2025-08-28" version="2.0.0-dev" />
<release date="2025-07-30" version="1.0.0" />
</releases>

View file

@ -201,8 +201,8 @@ namespace {
vk::Vulkan createVulkanInstance(vk::PhysicalDeviceSelector selectPhysicalDevice) {
try {
return{
"lsfg-vk", vk::version{1, 1, 0},
"lsfg-vk-engine", vk::version{1, 1, 0},
"lsfg-vk", vk::version{2, 0, 0},
"lsfg-vk-engine", vk::version{2, 0, 0},
selectPhysicalDevice,
false, std::nullopt,
findCacheFilePath()

View file

@ -75,8 +75,8 @@ int main() {
const uint64_t time_us = get_current_time_us();
const vk::Vulkan vk{
"lsfg-vk-debug", vk::version{1, 1, 0},
"lsfg-vk-debug-engine", vk::version{1, 0, 0},
"lsfg-vk-debug", vk::version{2, 0, 0},
"lsfg-vk-debug-engine", vk::version{2, 0, 0},
[](const vk::VulkanInstanceFuncs,
const std::vector<VkPhysicalDevice>& devices) {
return devices.front();

View file

@ -12,9 +12,6 @@ target_link_libraries(lsfg-vk-layer
set_target_properties(lsfg-vk-layer PROPERTIES
CXX_VISIBILITY_PRESET hidden)
set(LSFGVK_LAYER_LIBRARY_PATH
"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/liblsfg-vk-layer.so"
CACHE STRING "Path to Vulkan layer shared object")
configure_file(
"VkLayer_LSFGVK_frame_generation.json.in"
"VkLayer_LSFGVK_frame_generation.json"

View file

@ -38,8 +38,8 @@ QStringList ui::getAvailableGPUs() { // NOLINT (IWYU)
}
// first remove 1:1 duplicates
std::ranges::sort(gpus);
gpus.erase(std::ranges::unique(gpus).begin(), gpus.end());
std::sort(gpus.begin(), gpus.end()); // NOLINT (ranges [thanks gcc!])
gpus.erase(std::unique(gpus.begin(), gpus.end()), gpus.end()); // NOLINT
// build the frontend list
QStringList list{"Default"}; // NOLINT (IWYU)