CI: fix build

fastfetch-cli · Sep 26, 2024 · 4283d96 · 4283d96
1 parent e07fcc4
commit 4283d96
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -74,7 +74,7 @@ jobs:
  run: uname -a
 
  - name: install required packages
- run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev
+ run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev python3-requests
 
  - name: install linuxbrew packages
  run: |
@@ -247,7 +247,7 @@ jobs:
  run: |
  cat /etc/alpine-release
  uname -a
- apk add cmake samurai vulkan-loader-dev libxcb-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev xfconf-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev elfutils-dev gcc g++
+ apk add cmake samurai vulkan-loader-dev libxcb-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev xfconf-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev elfutils-dev py3-requests gcc g++
  shell: alpine.sh --root {0}
 
  - name: build
@@ -385,7 +385,7 @@ jobs:
  pkg install gcc13 cmake git pkg-config glib2 dbus sqlite-3 imagemagick
 
  run: |
- cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On .
+ cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
  cmake --build . --target package --verbose -j4
  ./fastfetch --list-features
  time ./fastfetch -c presets/ci.jsonc --stat false
@@ -422,7 +422,7 @@ jobs:
  run: |
  uname -a
  sudo pkg update
- sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm libelf glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat
+ sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm libelf glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat py311-requests
  cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On .
  cmake --build . --target package --verbose -j4
  ./fastfetch --list-features

diff --git a/scripts/gen-pciids.py b/scripts/gen-pciids.py
@@ -9,10 +9,10 @@ class PciVendorModel:
  def __init__(self, id: int, name: str):
  self.id = id
  self.name = name
- self.devices: list[PciDeviceModel] = []
+ self.devices = []
 
-def main(keep_vendor_list: set[int]):
- vendors: list[PciVendorModel] = []
+def main(keep_vendor_list: set):
+ vendors = []
  try:
  with open('pci.ids', 'r') as f:
  full_text = f.read()