Merge pull request #636 from Kicer86/update_images

Switch to ubuntu 24.04
Kicer86 · May 15, 2024 · 0324a07 · 0324a07
2 parents a1ad7d9 + dc535cb
commit 0324a07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 21 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -13,14 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
 
     steps:
-    # switch to ubuntu 23.10
-    - name: Update Repositories
-      run: |
-        sudo sed -i 's/jammy/mantic/g' /etc/apt/sources.list
-
     - uses: actions/checkout@v4
       with:
         submodules: true
@@ -30,7 +25,6 @@ jobs:
       run: |
         sudo apt-get update &&              \
         sudo apt-get install                \
-          gcc                               \
           lcov                              \
           ninja-build                       \
           python3-cairosvg                  \
@@ -51,6 +45,7 @@ jobs:
           libqt6quick3druntimerender6       \
           libboost-dev                      \
           libopencv-dev                     \
+          libopenblas-dev                   \
           libdlib-dev                       \
           libgmock-dev                      \
           libgl1-mesa-dev                   \

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -18,14 +18,9 @@ jobs:
           - { compiler: LLVM, CC: clang-16, CXX: clang++-16 }
         build: [Release]
         shared: [TRUE, FALSE]
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
 
     steps:
-    # switch to ubuntu 23.10
-    - name: Update Repositories
-      run: |
-        sudo sed -i 's/jammy/mantic/g' /etc/apt/sources.list
-
     - uses: actions/checkout@v4
       with:
         submodules: true
@@ -35,7 +30,6 @@ jobs:
       run: |
         sudo apt-get update &&              \
         sudo apt-get install                \
-          gcc                               \
           ninja-build                       \
           python3-cairosvg                  \
           python3-defusedxml                \
@@ -56,19 +50,13 @@ jobs:
           libavformat-dev                   \
           libboost-dev                      \
           libopencv-dev                     \
+          libopenblas-dev                   \
           libdlib-dev                       \
           libgmock-dev                      \
           libgl1-mesa-dev                   \
           libglvnd-dev                      \
           libwebp-dev
 
-    # todo: this step will be redundant when github actions use ubuntu >= 23.10 by default
-    - name: Install clang
-      if: matrix.compiler.compiler == 'LLVM'
-      run: |
-        sudo apt-get install    \
-          clang
-
     - name: Install magic enum
       run: |
         sudo wget https://raw.githubusercontent.com/Neargye/magic_enum/87190b8/include/magic_enum.hpp -O /usr/include/magic_enum.hpp