fix workflows

ucpu · Jul 18, 2024 · 6c18557 · 6c18557
1 parent 575e8b9
commit 6c18557
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 38 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -4,30 +4,22 @@ on: [push, pull_request]
 jobs:
   analyze:
     name: Analyze
-    runs-on: 'ubuntu-latest'
+    runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read
       security-events: write
     env:
-      CC: ${{ matrix.compiler.cc }}
-      CXX: ${{ matrix.compiler.cxx }}
+      CC: clang
+      CXX: clang++
     strategy:
       fail-fast: false
-      matrix:
-        language: [ 'cpp' ]
-        compiler:
-        - {
-            cc: clang-15,
-            cxx: clang++-15,
-            install: clang-15
-          }
 
     steps:
     - name: Install packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y xorg-dev nasm libssl-dev ${{ matrix.compiler.install }}
+        sudo apt-get install -y xorg-dev libwayland-dev libxkbcommon-dev libpulse-dev libasound2-dev nasm libssl-dev
 
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -37,7 +29,7 @@ jobs:
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
-        languages: ${{ matrix.language }}
+        languages: cpp
         config: |
           query-filters:
             - exclude:
@@ -57,4 +49,4 @@ jobs:
     - name: CodeQL Analysis
       uses: github/codeql-action/analyze@v2
       with:
-        category: "/language:${{matrix.language}}"
+        category: "/language:cpp"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -74,25 +74,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os-version: [22]
+        os-version: [24]
         build-config: [debug, release, relwithdebinfo]
         compiler:
         - {
-            cc: gcc-12,
-            cxx: g++-12,
-            install: gcc-12 g++-12
+            cc: gcc-13,
+            cxx: g++-13,
+            install: gcc-13 g++-13
           }
         - {
-            cc: clang-15,
-            cxx: clang++-15,
-            install: clang-15
+            cc: clang-18,
+            cxx: clang++-18,
+            install: clang-18
           }
 
     steps:
     - name: Install packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y xorg-dev nasm libssl-dev ${{ matrix.compiler.install }}
+        sudo apt-get install -y xorg-dev libwayland-dev libxkbcommon-dev libpulse-dev libasound2-dev nasm libssl-dev ${{ matrix.compiler.install }}
 
     - name: Versions
       run: |
@@ -150,16 +150,16 @@ jobs:
     needs: Ubuntu
     runs-on: ubuntu-latest
     env:
-      CC: clang-15
-      CXX: clang++-15
+      CC: clang
+      CXX: clang++
     strategy:
       fail-fast: false
 
     steps:
     - name: Install packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y xorg-dev nasm libssl-dev clang-15
+        sudo apt-get install -y xorg-dev libwayland-dev libxkbcommon-dev libpulse-dev libasound2-dev nasm libssl-dev
 
     - uses: actions/checkout@v4
       with:
@@ -190,8 +190,8 @@ jobs:
       CFLAGS: ${{ matrix.sanitizer.flags }}
       CXXFLAGS: ${{ matrix.sanitizer.flags }}
       LDFLAGS: ${{ matrix.sanitizer.flags }}
-      CC: clang-15
-      CXX: clang++-15
+      CC: clang
+      CXX: clang++
     strategy:
       fail-fast: false
       matrix:
@@ -214,7 +214,7 @@ jobs:
     - name: Install packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y xorg-dev nasm libssl-dev clang-15
+        sudo apt-get install -y xorg-dev libwayland-dev libxkbcommon-dev libpulse-dev libasound2-dev nasm libssl-dev
 
     - name: Versions
       run: |
@@ -250,8 +250,8 @@ jobs:
     needs: Ubuntu
     runs-on: ubuntu-latest
     env:
-      CC: gcc-12
-      CXX: g++-12
+      CC: gcc
+      CXX: g++
     strategy:
       fail-fast: false
       matrix:
@@ -269,7 +269,7 @@ jobs:
     - name: Install packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y xorg-dev nasm valgrind libssl-dev g++-12
+        sudo apt-get install -y xorg-dev libwayland-dev libxkbcommon-dev libpulse-dev libasound2-dev nasm libssl-dev
 
     - uses: actions/checkout@v4
       with:

diff --git a/BUILDING.md b/BUILDING.md
@@ -36,13 +36,7 @@ It may work on other distributions with little changes.
 
 Install required packages.
 ```bash
-sudo apt install xorg-dev nasm libssl-dev
-```
-
-Optional sound backend (choose one).
-```bash
-sudo apt install libpulse-dev
-sudo apt install libasound2-dev
+sudo apt install xorg-dev libwayland-dev libxkbcommon-dev libpulse-dev libasound2-dev nasm libssl-dev
 ```
 
 Prepare build directory.