From dd5190aa680a7543143e724a100bd5d6e9898dd7 Mon Sep 17 00:00:00 2001 From: PancakeTAS Date: Sat, 19 Jul 2025 15:59:04 +0200 Subject: [PATCH] remove broken workflows (and fix them) --- .github/workflows/build-arch.yml | 2 +- .github/workflows/build-debian.yml | 5 +++-- .github/workflows/build-fedora.yml | 3 ++- .github/workflows/build-ubuntu.yml | 30 ++++++++++-------------------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-arch.yml b/.github/workflows/build-arch.yml index 73f1a10..069e1d6 100644 --- a/.github/workflows/build-arch.yml +++ b/.github/workflows/build-arch.yml @@ -21,7 +21,7 @@ jobs: clang llvm \ cmake ninja \ spirv-headers vulkan-headers vulkan-icd-loader \ - xorg + xorg wayland wayland-protocols mesa-utils - name: Checkout repository uses: actions/checkout@v4 with: diff --git a/.github/workflows/build-debian.yml b/.github/workflows/build-debian.yml index 5bed5dd..3e662d4 100644 --- a/.github/workflows/build-debian.yml +++ b/.github/workflows/build-debian.yml @@ -21,10 +21,11 @@ jobs: apt-get install -y \ build-essential \ clang clang-tools llvm \ - git tar \ + git \ cmake ninja-build \ spirv-headers libvulkan-dev \ - xorg-dev xutils-dev + xorg-dev xutils-dev \ + libwayland-dev libxkbcommon-dev - name: Checkout repository uses: actions/checkout@v4 with: diff --git a/.github/workflows/build-fedora.yml b/.github/workflows/build-fedora.yml index 299996c..029ae21 100644 --- a/.github/workflows/build-fedora.yml +++ b/.github/workflows/build-fedora.yml @@ -23,7 +23,8 @@ jobs: clang llvm \ cmake ninja-build \ spirv-headers-devel vulkan-headers vulkan-loader-devel \ - libX11-devel libXrandr-devel libXinerama-devel libXcursor-devel libXi-devel mesa-libGL-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: diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index e5c941e..d02bd54 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -7,25 +7,18 @@ jobs: build-ubuntu: runs-on: ubuntu-latest steps: - - name: Prepare permissions for apt cache - run: | - sudo chmod a+rwx -R /var/cache/apt/archives - - name: Prepare cache for apt packages - uses: actions/cache@v4 - with: - path: /var/cache/apt/archives - key: ubuntu-apt-cache - name: Install build dependencies - run: | - export DEBIAN_FRONTEND=noninteractive - sudo apt-get update - sudo apt-get install -y \ - build-essential \ - clang clang-tools llvm \ - git tar \ - cmake ninja-build \ - spirv-headers libvulkan-dev \ + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: build-essential + clang clang-tools llvm + git + cmake ninja-build + spirv-headers libvulkan-dev xorg-dev xutils-dev + libwayland-dev libxkbcommon-x11-dev + version: 1.0 + execute_install_scripts: true - name: Checkout SPIR-V uses: actions/checkout@v4 with: @@ -58,6 +51,3 @@ jobs: path: | build-release/share/vulkan/implicit_layer.d/VkLayer_LS_frame_generation.json build-release/lib/liblsfg-vk.so - - name: Prepare permissions for apt cache - run: | - sudo chmod a+rwx -R /var/cache/apt/archives