ci: add libgl-dev and libgl1-mesa-dev dependencies to Linux workflows

EndstoneMC · Jun 26, 2024 · e38cdfe · e38cdfe
1 parent 9940b3e
commit e38cdfe
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -31,13 +31,15 @@ jobs:
           LLVM_VERSION: 15
         run: |
           sudo apt-get update -y -q
-          sudo apt-get install -y -q build-essential lsb-release wget software-properties-common gnupg
+          sudo apt-get install -y -q build-essential lsb-release wget software-properties-common gnupg pkg-config libgl-dev libgl1-mesa-dev
           sudo wget https://apt.llvm.org/llvm.sh
           sudo chmod +x llvm.sh
           sudo ./llvm.sh ${LLVM_VERSION}
           sudo apt-get install -y -q libc++-${LLVM_VERSION}-dev libc++abi-${LLVM_VERSION}-dev
           sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${LLVM_VERSION} 100
           sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${LLVM_VERSION} 100
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM_VERSION} 100
+          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 100
           sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${LLVM_VERSION} 100
           sudo update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-${LLVM_VERSION} 100
 

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -37,13 +37,15 @@ jobs:
           LLVM_VERSION: 15
         run: |
           sudo apt-get update -y -q
-          sudo apt-get install -y -q build-essential lsb-release wget software-properties-common gnupg
+          sudo apt-get install -y -q build-essential lsb-release wget software-properties-common gnupg pkg-config libgl-dev libgl1-mesa-dev
           sudo wget https://apt.llvm.org/llvm.sh
           sudo chmod +x llvm.sh
           sudo ./llvm.sh ${LLVM_VERSION}
           sudo apt-get install -y -q libc++-${LLVM_VERSION}-dev libc++abi-${LLVM_VERSION}-dev
           sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${LLVM_VERSION} 100
           sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${LLVM_VERSION} 100
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM_VERSION} 100
+          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 100
           sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${LLVM_VERSION} 100
           sudo update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-${LLVM_VERSION} 100
 

diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
@@ -86,13 +86,15 @@ jobs:
           LLVM_VERSION: 15
         run: |
           sudo apt-get update -y -q
-          sudo apt-get install -y -q build-essential lsb-release wget software-properties-common gnupg
+          sudo apt-get install -y -q build-essential lsb-release wget software-properties-common gnupg pkg-config libgl-dev libgl1-mesa-dev
           sudo wget https://apt.llvm.org/llvm.sh
           sudo chmod +x llvm.sh
           sudo ./llvm.sh ${LLVM_VERSION}
           sudo apt-get install -y -q libc++-${LLVM_VERSION}-dev libc++abi-${LLVM_VERSION}-dev
           sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${LLVM_VERSION} 100
           sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${LLVM_VERSION} 100
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM_VERSION} 100
+          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 100
           sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${LLVM_VERSION} 100
           sudo update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-${LLVM_VERSION} 100
 

diff --git a/Dockerfile b/Dockerfile
@@ -10,13 +10,15 @@ FROM base AS builder
 ARG LLVM_VERSION=15
 
 RUN apt-get update -y -qq \
-    && apt-get install -y -qq build-essential lsb-release wget software-properties-common gnupg \
+    && apt-get install -y -qq build-essential lsb-release wget software-properties-common gnupg pkg-config libgl-dev libgl1-mesa-dev \
     && wget https://apt.llvm.org/llvm.sh \
     && chmod +x llvm.sh \
     && ./llvm.sh ${LLVM_VERSION} \
     && apt-get install -y -qq libc++-${LLVM_VERSION}-dev libc++abi-${LLVM_VERSION}-dev \
     && update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${LLVM_VERSION} 100 \
     && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${LLVM_VERSION} 100 \
+    && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${LLVM_VERSION} 100 \
+    && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 100 \
     && update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${LLVM_VERSION} 100 \
     && update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-${LLVM_VERSION} 100
 

diff --git a/conanfile.py b/conanfile.py
@@ -34,6 +34,10 @@ class EndstoneRecipe(ConanFile):
         "capstone/*:tms320c64x": False,
         "capstone/*:m680x": False,
         "capstone/*:evm": False,
+        "glfw/*:with_x11": False,
+        "glfw/*:with_wayland": False,
+        "libglvnd/*:x11": False,
+        "libglvnd/*:glx": False,
     }
 
     exports_sources = "CMakeLists.txt", "src/*", "include/*", "tests/*"