Skip to content

Commit

Permalink
Merge pull request #563 from nucleic/linux-ci
Browse files Browse the repository at this point in the history
CI: fix dependencies installation on linux
  • Loading branch information
MatthieuDartiailh authored Jan 7, 2025
2 parents 112f58c + 4539f54 commit 3bcd2a4
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 27 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,16 @@ jobs:
- name: Install linux only test dependency
if: matrix.os == 'ubuntu-latest'
# Install all dependencies needed to run Qt on linux (taken from the qt website)
# https://doc.qt.io/qt-6/linux.html
# https://doc.qt.io/qt-6/linux-requirements.html
run: |
sudo apt-get update --fix-missing;
if [ "${{ matrix.qt-version }}" == 5 ]; then
cat ci/qt5_linux.txt | xargs sudo apt-get -y install
cat ci/qt5_linux.txt | xargs sudo apt -y install
else
cat ci/qt6_linux.txt | xargs sudo apt-get -y install
cat ci/qt6_linux.txt | xargs sudo apt -y install
fi
sudo apt-get install -y herbstluftwm scrot
sudo apt install -y xvfb herbstluftwm scrot
- name: Get history and tags for SCM versioning to work
run: |
git fetch --prune --unshallow
Expand Down
11 changes: 4 additions & 7 deletions ci/qt5_linux.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

build-essential
libgl1-mesa-dev
libfontconfig1-dev
libfreetype6-dev
libx11-dev
Expand All @@ -13,15 +14,11 @@ libxcb-keysyms1-dev
libxcb-image0-dev
libxcb-shm0-dev
libxcb-icccm4-dev
libxcb-sync0-dev
libxcb-sync-dev
libxcb-xfixes0-dev
libxcb-shape0-dev
libxcb-randr0-dev
libxcb-render-util0-dev
libxcb-xinerama0-dev
libxkbcommon-dev
libxkbcommon-x11-dev
libxcb-xinerama0-dev
libxcb-xkb-dev
libxcb-xtest0-dev
libegl1-mesa
xvfb
31 changes: 14 additions & 17 deletions ci/qt6_linux.txt
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@

build-essential
libgl1-mesa-dev
libfontconfig1-dev
libfreetype6-dev
libfreetype-dev
libx11-dev
libx11-xcb-dev
libxext-dev
libxfixes-dev
libxi-dev
libxrender-dev
libxcb1-dev
libxcb-cursor-dev
libxcb-glx0-dev
libxcb-keysyms1-dev
libxcb-image0-dev
libxcb-shm0-dev
libxcb-icccm4-dev
libxcb-sync-dev
libxcb-xfixes0-dev
libxcb-shape0-dev
libxcb-image0-dev
libxcb-keysyms1-dev
libxcb-randr0-dev
libxcb-render-util0-dev
libxcb-shape0-dev
libxcb-shm0-dev
libxcb-sync-dev
libxcb-util-dev
libxcb-xfixes0-dev
libxcb-xinerama0-dev
libxcb-xkb-dev
libxcb1-dev
libxext-dev
libxfixes-dev
libxi-dev
libxkbcommon-dev
libxkbcommon-x11-dev
libxcb-xkb-dev
libxcb-xtest0-dev
libegl1-mesa
xvfb
libxrender-dev

0 comments on commit 3bcd2a4

Please sign in to comment.